From: Jan Schneider Date: Mon, 3 Aug 2009 18:39:28 +0000 (+0200) Subject: Revert "BC" X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=25dc169bf78c8ac3da6b51d4b67d99c2b499d096;p=horde.git Revert "BC" This reverts commit e652e9d819dfc582a3bd69286c7ef0e335593525. --- diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 791c7b0ae..6414686b9 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -285,7 +285,7 @@ HTML; { global $conf; - $driver = empty($conf['cachejs']) || $conf['cachejs'] == 'none' + $driver = empty($conf['cachejs']) ? 'none' : $conf['cachejsparams']['driver']; $hsf = Horde_Script_Files::singleton(); @@ -1657,7 +1657,7 @@ HTML; $css = array_merge($css, $options['additional']); } - $cache_type = empty($conf['cachecss']) || $conf['cachecss'] == 'none' + $cache_type = empty($conf['cachecss']) ? 'none' : $conf['cachecss'];