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
2f08ed72
Commit
2f08ed72
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Setting breezy as default directly in IconTheme class to avoid weird things when icons are missing
parent
7116db8c
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
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
html/geticon.php
+0
-1
html/geticon.php
include/class_IconTheme.inc
+2
-2
include/class_IconTheme.inc
with
2 additions
and
3 deletions
+2
-3
html/geticon.php
+
0
−
1
View file @
2f08ed72
...
@@ -34,7 +34,6 @@ if (session::global_is_set('config')) {
...
@@ -34,7 +34,6 @@ if (session::global_is_set('config')) {
}
else
{
}
else
{
header
(
"cache-control: no-cache"
);
header
(
"cache-control: no-cache"
);
}
}
IconTheme
::
$default_theme
=
'breezy'
;
IconTheme
::
$extensions
=
array
(
'png'
);
IconTheme
::
$extensions
=
array
(
'png'
);
if
(
!
isset
(
$_GET
[
'context'
])
||
!
isset
(
$_GET
[
'icon'
])
||
!
isset
(
$_GET
[
'size'
]))
{
if
(
!
isset
(
$_GET
[
'context'
])
||
!
isset
(
$_GET
[
'icon'
])
||
!
isset
(
$_GET
[
'size'
]))
{
trigger_error
(
'Missing information in query string: '
.
$_SERVER
[
'QUERY_STRING'
]);
trigger_error
(
'Missing information in query string: '
.
$_SERVER
[
'QUERY_STRING'
]);
...
...
This diff is collapsed.
Click to expand it.
include/class_IconTheme.inc
+
2
−
2
View file @
2f08ed72
...
@@ -188,7 +188,7 @@ class IconTheme
...
@@ -188,7 +188,7 @@ class IconTheme
return
NULL
;
return
NULL
;
}
}
static
public
$default_theme
=
'
default
'
;
static
public
$default_theme
=
'
breezy
'
;
static
public
$extensions
=
array
(
'png'
,
'xpm'
,
'svg'
);
static
public
$extensions
=
array
(
'png'
,
'xpm'
,
'svg'
);
static
public
$find_closest
=
FALSE
;
static
public
$find_closest
=
FALSE
;
...
@@ -202,7 +202,7 @@ class IconTheme
...
@@ -202,7 +202,7 @@ class IconTheme
if
(
file_exists
(
"
$path
/
$file
/index.theme"
)
&&
!
preg_match
(
"/^\./"
,
$file
))
{
if
(
file_exists
(
"
$path
/
$file
/index.theme"
)
&&
!
preg_match
(
"/^\./"
,
$file
))
{
try
{
try
{
if
(
$file
==
static
::
$default_theme
)
{
if
(
$file
==
static
::
$default_theme
)
{
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
NULL
);
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
NULL
);
}
else
{
}
else
{
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
static
::
$default_theme
);
$themes
[
$file
]
=
new
IconTheme
(
"
$path
/
$file
"
,
static
::
$default_theme
);
}
}
...
...
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