projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e652e9d
)
Revert "BC"
author
Jan Schneider
<jan@horde.org>
Mon, 3 Aug 2009 18:39:28 +0000
(20:39 +0200)
committer
Jan Schneider
<jan@horde.org>
Mon, 3 Aug 2009 18:39:28 +0000
(20:39 +0200)
This reverts commit
e652e9d819dfc582a3bd69286c7ef0e335593525
.
framework/Core/lib/Horde.php
patch
|
blob
|
history
diff --git
a/framework/Core/lib/Horde.php
b/framework/Core/lib/Horde.php
index
791c7b0
..
6414686
100644
(file)
--- 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'];