From 2f08ed72a8561184f54baf595c0d1b5fbde228c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 13 Feb 2017 12:11:41 +0100
Subject: [PATCH] Setting breezy as default directly in IconTheme class to
avoid weird things when icons are missing
---
html/geticon.php | 1 -
include/class_IconTheme.inc | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/html/geticon.php b/html/geticon.php
index 2c7c7c419..334d254d9 100644
--- a/html/geticon.php
+++ b/html/geticon.php
@@ -34,7 +34,6 @@ if (session::global_is_set('config')) {
} else {
header("cache-control: no-cache");
}
-IconTheme::$default_theme = 'breezy';
IconTheme::$extensions = array('png');
if (!isset($_GET['context']) || !isset($_GET['icon']) || !isset($_GET['size'])) {
trigger_error('Missing information in query string: '.$_SERVER['QUERY_STRING']);
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 895d8e830..ea416e0b4 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -188,7 +188,7 @@ class IconTheme
return NULL;
}
- static public $default_theme = 'default';
+ static public $default_theme = 'breezy';
static public $extensions = array('png', 'xpm', 'svg');
static public $find_closest = FALSE;
@@ -202,7 +202,7 @@ class IconTheme
if (file_exists("$path/$file/index.theme") && !preg_match("/^\./", $file)) {
try {
if ($file == static::$default_theme) {
- $themes[$file] = new IconTheme("$path/$file", NULL);
+ $themes[$file] = new IconTheme("$path/$file", NULL);
} else {
$themes[$file] = new IconTheme("$path/$file", static::$default_theme);
}
--
GitLab