Commit 2f08ed72 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Setting breezy as default directly in IconTheme class to avoid weird things when icons are missing

parent 7116db8c
...@@ -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']);
......
...@@ -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);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment