summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2012-09-18 22:46:47 +0200
committerMichael Hamann <michael@content-space.de>2012-09-18 22:46:47 +0200
commitdbf794bf86316c93b56454ab5d2c658598cce617 (patch)
tree1963b21d90485088b11095278a94799144698a0a /lib/exe
parent14977bd2edded61cecdc10116826eef384777e82 (diff)
downloadrpg-dbf794bf86316c93b56454ab5d2c658598cce617.tar.gz
rpg-dbf794bf86316c93b56454ab5d2c658598cce617.tar.bz2
Set default userstyle only once as screen userstyle
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/css.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 0ad9dee06..cee806ef4 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -61,6 +61,11 @@ function css_out(){
}
}
+ // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
+ if (isset($config_cascade['userstyle']['default'])) {
+ $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
+ }
+
// start output buffering
ob_start();
@@ -86,10 +91,6 @@ function css_out(){
if (isset($tplstyles[$mediatype])) {
$files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]);
}
- // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
- if (isset($config_cascade['userstyle']['default'])) {
- $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
- }
// load user styles
if(isset($config_cascade['userstyle'][$mediatype])){
$files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;