Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
3f0c84f9
Commit
3f0c84f9
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Cleaned a bit Exception use in IconTheme
parent
27aaa535
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
fusiondirectory-1.2.1
fusiondirectory-1.2
fusiondirectory-1.1.1
fusiondirectory-1.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_IconTheme.inc
+5
-2
include/class_IconTheme.inc
with
5 additions
and
2 deletions
+5
-2
include/class_IconTheme.inc
+
5
−
2
View file @
3f0c84f9
...
@@ -18,6 +18,8 @@
...
@@ -18,6 +18,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
*/
class
ThemeFileParsingException
extends
Exception
;
class
IconThemeDir
class
IconThemeDir
{
{
private
$Size
;
private
$Size
;
...
@@ -83,7 +85,7 @@ class IconTheme
...
@@ -83,7 +85,7 @@ class IconTheme
$this
->
path
=
$folder
;
$this
->
path
=
$folder
;
$datas
=
@
parse_ini_file
(
$folder
.
'/index.theme'
,
TRUE
,
INI_SCANNER_RAW
);
$datas
=
@
parse_ini_file
(
$folder
.
'/index.theme'
,
TRUE
,
INI_SCANNER_RAW
);
if
(
$datas
===
FALSE
)
{
if
(
$datas
===
FALSE
)
{
throw
new
Exception
(
'Error while parsing theme file'
);
throw
new
ThemeFileParsing
Exception
(
'Error while parsing theme file'
);
}
}
if
(
isset
(
$datas
[
'Icon Theme'
][
'Directories'
])
&&
!
empty
(
$datas
[
'Icon Theme'
][
'Directories'
]))
{
if
(
isset
(
$datas
[
'Icon Theme'
][
'Directories'
])
&&
!
empty
(
$datas
[
'Icon Theme'
][
'Directories'
]))
{
$dirs
=
preg_split
(
'/,/'
,
$datas
[
'Icon Theme'
][
'Directories'
]);
$dirs
=
preg_split
(
'/,/'
,
$datas
[
'Icon Theme'
][
'Directories'
]);
...
@@ -186,7 +188,8 @@ class IconTheme
...
@@ -186,7 +188,8 @@ class IconTheme
}
else
{
}
else
{
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
static
::
$default_theme
);
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
static
::
$default_theme
);
}
}
}
catch
(
Exception
$e
)
{
}
catch
(
ThemeFileParsingException
$e
)
{
continue
;
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets