summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2015-07-24 12:23:37 +0200
committerAndreas Gohr <andi@splitbrain.org>2015-07-24 12:23:37 +0200
commit20a2375a6cfe911180fca2c58673b4554528a372 (patch)
treed90cd89466676a3385e6c01f73aa162ee3c86d9c /lib
parentdfbeea0341741e80e32e29f4ca832f79ac21b1d8 (diff)
downloadrpg-20a2375a6cfe911180fca2c58673b4554528a372.tar.gz
rpg-20a2375a6cfe911180fca2c58673b4554528a372.tar.bz2
Revert "Additionally allow more media types" #982
This reverts commit de4634ec87b1a277c1686990d993dafc43db05ed.
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/css.php17
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 701cebaed..e0bc68312 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -32,25 +32,24 @@ function css_out(){
global $config_cascade;
global $INPUT;
- // decide from where to get the template
- $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
- if(!$tpl) $tpl = $conf['template'];
-
- // load style.ini
- $styleini = css_styleini($tpl);
-
- // find mediatypes
if ($INPUT->str('s') == 'feed') {
$mediatypes = array('feed');
$type = 'feed';
} else {
- $mediatypes = array_unique(array_merge(array('screen', 'all', 'print'), array_keys($styleini['stylesheets'])));
+ $mediatypes = array('screen', 'all', 'print');
$type = '';
}
+ // decide from where to get the template
+ $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
+ if(!$tpl) $tpl = $conf['template'];
+
// The generated script depends on some dynamic options
$cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
+ // load styl.ini
+ $styleini = css_styleini($tpl);
+
// if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
if (isset($config_cascade['userstyle']['default'])) {
$config_cascade['userstyle']['screen'] = array($config_cascade['userstyle']['default']);