From d572baf83c5a6d61a7f97aa4d115eba76c5f106c Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Tue, 21 May 2013 21:40:37 +0200
Subject: Add check for token when resizing and caching external images

---
 lib/exe/fetch.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/exe')

diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 7a2250373..5967494bf 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -60,6 +60,7 @@ if (defined('SIMPLE_TEST')) {
     if($evt->advise_before()) {
         // redirects
         if($data['status'] > 300 && $data['status'] <= 304) {
+            if (defined('SIMPLE_TEST')) return; //TestResponse doesn't recognize redirects
             send_redirect($data['statusmessage']);
         }
         // send any non 200 status
-- 
cgit v1.2.3


From d4a1ece8f011dd69db05b83d2f98e3207f1a7e48 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 29 Jul 2013 20:06:01 +0200
Subject: add LESS support

still needs testing
---
 lib/exe/css.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 1e662c64a..4a9c825c1 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,7 +154,11 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    // place all @import statements at the top of the file
+    // parse LESS
+    $less = new lessc();
+    $css = $less->compile($css);
+
+    // place all remaining @import statements at the top of the file
     $css = css_moveimports($css);
 
     // compress whitespace and comments
@@ -175,6 +179,9 @@ function css_out(){
  * Does placeholder replacements in the style according to
  * the ones defined in a templates style.ini file
  *
+ * This also adds the ini defined placeholders as less variables
+ * (sans the surrounding __ and with a ini_ prefix)
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function css_applystyle($css,$tplinc){
@@ -182,6 +189,13 @@ function css_applystyle($css,$tplinc){
 
     if($styleini){
         $css = strtr($css,$styleini['replacements']);
+
+        $less = '';
+        foreach($styleini as $key => $value){
+            $key = trim($key, '_');
+            $key = '@ini_'.$key;
+            $less .= "$key: $value\n";
+        }
     }
     return $css;
 }
@@ -333,14 +347,17 @@ function css_pluginstyles($mediatype='screen'){
     $plugins = plugin_list();
     foreach ($plugins as $p){
         $list[DOKU_PLUGIN."$p/$mediatype.css"]  = DOKU_BASE."lib/plugins/$p/";
+        $list[DOKU_PLUGIN."$p/$mediatype.less"]  = DOKU_BASE."lib/plugins/$p/";
         // alternative for screen.css
         if ($mediatype=='screen') {
             $list[DOKU_PLUGIN."$p/style.css"]  = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/style.less"]  = DOKU_BASE."lib/plugins/$p/";
         }
         // @deprecated 2012-04-09: rtl will cease to be a mode of its own,
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if($lang['direction'] == 'rtl'){
             $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/rtl.less"] = DOKU_BASE."lib/plugins/$p/";
         }
     }
     return $list;
-- 
cgit v1.2.3


From c51b334ee77310dc0055311092f224be0342cd65 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 12:07:15 +0200
Subject: fixed ini replacement to less variables stuff

---
 lib/exe/css.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 4a9c825c1..04516e8ba 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -191,11 +191,13 @@ function css_applystyle($css,$tplinc){
         $css = strtr($css,$styleini['replacements']);
 
         $less = '';
-        foreach($styleini as $key => $value){
+        foreach($styleini['replacements'] as $key => $value){
             $key = trim($key, '_');
             $key = '@ini_'.$key;
-            $less .= "$key: $value\n";
+            $less .= "$key: $value;\n";
         }
+
+        $css = $less.$css;
     }
     return $css;
 }
-- 
cgit v1.2.3


From cbe37079b2519e6a79696ab6525a61498ab3c3a6 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 15:56:29 +0200
Subject: convert ini replacements to less vars first

This makes it possible to safely overwrite ini replacements from within
any less file
---
 lib/exe/css.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 04516e8ba..0157e6a40 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,6 +154,9 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
+    print $css;
+
+
     // parse LESS
     $less = new lessc();
     $css = $less->compile($css);
@@ -188,15 +191,21 @@ function css_applystyle($css,$tplinc){
     $styleini = css_styleini($tplinc);
 
     if($styleini){
-        $css = strtr($css,$styleini['replacements']);
-
+        // we convert ini replacements to LESS variable names
+        // and build a list of variable: value; pairs
         $less = '';
         foreach($styleini['replacements'] as $key => $value){
-            $key = trim($key, '_');
-            $key = '@ini_'.$key;
-            $less .= "$key: $value;\n";
+            $lkey = trim($key, '_');
+            $lkey = '@ini_'.$lkey;
+            $less .= "$lkey: $value;\n";
+
+            $styleini['replacements'][$key] = $lkey;
         }
 
+        // we now replace all old ini replacements with LESS variables
+        $css = strtr($css, $styleini['replacements']);
+
+        // now prepend the list of LESS variables as the very first thing
         $css = $less.$css;
     }
     return $css;
-- 
cgit v1.2.3


From fbaa87779929e23ede8a79fd3890ef493fdb1d81 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 30 Jul 2013 16:00:28 +0200
Subject: removed debug statement. sorry

---
 lib/exe/css.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 0157e6a40..cd531ef35 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -154,9 +154,6 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    print $css;
-
-
     // parse LESS
     $less = new lessc();
     $css = $less->compile($css);
-- 
cgit v1.2.3


From fd975da73e627193ca68a681ea6b2556c8327f63 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 31 Jul 2013 11:58:47 +0100
Subject: removed possibility to have rtl.less files in plugins

---
 lib/exe/css.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index cd531ef35..5c966db82 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -365,7 +365,6 @@ function css_pluginstyles($mediatype='screen'){
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if($lang['direction'] == 'rtl'){
             $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
-            $list[DOKU_PLUGIN."$p/rtl.less"] = DOKU_BASE."lib/plugins/$p/";
         }
     }
     return $list;
-- 
cgit v1.2.3


From acd3eb673b5f7c26fc8ec53d0147b30769e2a866 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Fri, 2 Aug 2013 13:41:42 +0200
Subject: Enable LANG.template.<template>.key to provide localized strings in
 templates

---
 lib/exe/js.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'lib/exe')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 06769d895..4b4b598de 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -96,6 +96,10 @@ function js_out(){
     // load JS specific translations
     $json = new JSON();
     $lang['js']['plugins'] = js_pluginstrings();
+    $templatestrings = js_templatestrings();
+    if(!empty($templatestrings)) {
+        $lang['js']['template'] = $templatestrings;
+    }
     echo 'LANG = '.$json->encode($lang['js']).";\n";
 
     // load toolbar
@@ -210,6 +214,21 @@ function js_pluginstrings()
     return $pluginstrings;
 }
 
+function js_templatestrings() {
+    global $conf;
+    $templatestrings = array();
+    if (@file_exists(tpl_incdir()."lang/en/lang.php")) {
+        include tpl_incdir()."lang/en/lang.php";
+    }
+    if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
+        include tpl_incdir()."lang/".$conf['lang']."/lang.php";
+    }
+    if (isset($lang['js'])) {
+        $templatestrings[$conf['template']] = $lang['js'];
+    }
+    return $templatestrings;
+}
+
 /**
  * Escapes a String to be embedded in a JavaScript call, keeps \n
  * as newline
-- 
cgit v1.2.3


From 72a66eb76026e69cd4554035a010693d6ae017ad Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 2 Aug 2013 18:12:46 +0200
Subject: check less compilation for errors

This now gives proper files and line numbers for errors
---
 lib/exe/css.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 5c966db82..91fc11d66 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -131,6 +131,8 @@ function css_out(){
         // load files
         $css_content = '';
         foreach($files[$mediatype] as $file => $location){
+            $display = str_replace(fullpath(DOKU_INC), '', fullpath($file));
+            $css_content .= "\n/* XXXXXXXXX $display XXXXXXXXX */\n";
             $css_content .= css_loadfile($file, $location);
         }
         switch ($mediatype) {
@@ -154,9 +156,8 @@ function css_out(){
     // apply style replacements
     $css = css_applystyle($css,$tplinc);
 
-    // parse LESS
-    $less = new lessc();
-    $css = $less->compile($css);
+    // parse less
+    $css = css_parseless($css);
 
     // place all remaining @import statements at the top of the file
     $css = css_moveimports($css);
@@ -175,6 +176,59 @@ function css_out(){
     http_cached_finish($cache->cache, $css);
 }
 
+/**
+ * Uses phpless to parse LESS in our CSS
+ *
+ * most of this function is error handling to show a nice useful error when
+ * LESS compilation fails
+ *
+ * @param $css
+ * @return string
+ */
+function css_parseless($css) {
+    $less = new lessc();
+    try {
+        return $less->compile($css);
+    } catch(Exception $e) {
+        // get exception message
+        $msg = str_replace(array("\n", "\r", "'"), array(), $e->getMessage());
+
+        // try to use line number to find affected file
+        if(preg_match('/line: (\d+)$/', $msg, $m)){
+            $msg = substr($msg, 0, -1* strlen($m[0])); //remove useless linenumber
+            $lno = $m[1];
+
+            // walk upwards to last include
+            $lines = explode("\n", $css);
+            $count = count($lines);
+            for($i=$lno-1; $i>=0; $i--){
+                if(preg_match('/\/(\* XXXXXXXXX )(.*?)( XXXXXXXXX \*)\//', $lines[$i], $m)){
+                    // we found it, add info to message
+                    $msg .= ' in '.$m[2].' at line '.($lno-$i);
+                    break;
+                }
+            }
+        }
+
+        // something went wrong
+        $error = 'A fatal error occured during compilation of the CSS files. '.
+            'If you recently installed a new plugin or template it '.
+            'might be broken and you should try disabling it again. ['.$msg.']';
+
+        echo ".dokuwiki:before {
+            content: '$error';
+            background-color: red;
+            display: block;
+            background-color: #fcc;
+            border-color: #ebb;
+            color: #000;
+            padding: 0.5em;
+        }";
+
+        exit;
+    }
+}
+
 /**
  * Does placeholder replacements in the style according to
  * the ones defined in a templates style.ini file
-- 
cgit v1.2.3


From d1e37fb0c8f6a5f768bd6cacfcce6c338b4c3831 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sat, 3 Aug 2013 13:07:28 +0200
Subject: Populate global variable JSINFO also in the Media Manager popup

---
 lib/exe/mediamanager.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 66e5ddc82..7cd91fe8f 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -29,12 +29,13 @@
         $IMG = null;
     }
 
-    global $INFO;
+    global $INFO, $JSINFO;
     $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
+    $JSINFO = array('id' => $ID, 'namespace' => $NS);
     $AUTH = $INFO['perm'];    // shortcut for historical reasons
 
-    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
-    session_write_close();  //close session
+    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+    session_write_close();  //close session
 
     // do not display the manager if user does not have read access
     if($AUTH < AUTH_READ && !$fullscreen) {
-- 
cgit v1.2.3


From afb2c08218345dc3604024c829a5c408e3f39277 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 14:42:05 +0200
Subject: allow for a style.ini in conf/<tpl>/style.ini

This is another go at what pull request #227 tried to do. This removes
support for a style.local.ini in the template file in preference of a
style.ini in the conf folder
---
 lib/exe/css.php | 139 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 79 insertions(+), 60 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 83972d407..ce6a83fea 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -40,43 +40,33 @@ function css_out(){
         $type = '';
     }
 
+    // decide from where to get the template
     $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
-    if($tpl){
-        $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
-        $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
-    }else{
-        $tplinc = tpl_incdir();
-        $tpldir = tpl_basedir();
-    }
-
-    // used style.ini file
-    $styleini = css_styleini($tplinc);
+    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.$tplinc.$type,'.css');
+    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
 
-    // load template styles
-    $tplstyles = array();
-    if ($styleini) {
-        foreach($styleini['stylesheets'] as $file => $mode) {
-            $tplstyles[$mode][$tplinc.$file] = $tpldir;
-        }
-    }
+    // load styl.ini
+    $styleini = css_styleini($tpl);
+
+    print_r($styleini);
 
     // 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'];
     }
 
-    // Array of needed files and their web locations, the latter ones
-    // are needed to fix relative paths in the stylesheets
-    $files = array();
-
+    // cache influencers
+    $tplinc = tpl_basedir($tpl);
     $cache_files = getConfigFiles('main');
     $cache_files[] = $tplinc.'style.ini';
-    $cache_files[] = $tplinc.'style.local.ini';
+    $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
 
+    // Array of needed files and their web locations, the latter ones
+    // are needed to fix relative paths in the stylesheets
+    $files = array();
     foreach($mediatypes as $mediatype) {
         $files[$mediatype] = array();
         // load core styles
@@ -88,8 +78,8 @@ function css_out(){
         // load plugin styles
         $files[$mediatype] = array_merge($files[$mediatype], css_pluginstyles($mediatype));
         // load template styles
-        if (isset($tplstyles[$mediatype])) {
-            $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]);
+        if (isset($styleini['stylesheets'][$mediatype])) {
+            $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets'][$mediatype]);
         }
         // load user styles
         if(isset($config_cascade['userstyle'][$mediatype])){
@@ -101,7 +91,7 @@ function css_out(){
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if ($mediatype=='screen') {
             if($lang['direction'] == 'rtl'){
-                if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']);
+                if (isset($styleini['stylesheets']['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets']['rtl']);
                 if (isset($config_cascade['userstyle']['rtl'])) $files[$mediatype][$config_cascade['userstyle']['rtl']] = DOKU_BASE;
             }
         }
@@ -154,7 +144,7 @@ function css_out(){
     ob_end_clean();
 
     // apply style replacements
-    $css = css_applystyle($css,$tplinc);
+    $css = css_applystyle($css, $styleini['replacements']);
 
     // parse less
     $css = css_parseless($css);
@@ -200,7 +190,6 @@ function css_parseless($css) {
 
             // walk upwards to last include
             $lines = explode("\n", $css);
-            $count = count($lines);
             for($i=$lno-1; $i>=0; $i--){
                 if(preg_match('/\/(\* XXXXXXXXX )(.*?)( XXXXXXXXX \*)\//', $lines[$i], $m)){
                     // we found it, add info to message
@@ -238,50 +227,80 @@ function css_parseless($css) {
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-function css_applystyle($css,$tplinc){
-    $styleini = css_styleini($tplinc);
-
-    if($styleini){
-        // we convert ini replacements to LESS variable names
-        // and build a list of variable: value; pairs
-        $less = '';
-        foreach($styleini['replacements'] as $key => $value){
-            $lkey = trim($key, '_');
-            $lkey = '@ini_'.$lkey;
-            $less .= "$lkey: $value;\n";
-
-            $styleini['replacements'][$key] = $lkey;
-        }
+function css_applystyle($css, $replacements) {
+    // we convert ini replacements to LESS variable names
+    // and build a list of variable: value; pairs
+    $less = '';
+    foreach((array) $replacements as $key => $value) {
+        $lkey = trim($key, '_');
+        $lkey = '@ini_'.$lkey;
+        $less .= "$lkey: $value;\n";
+
+        $replacements[$key] = $lkey;
+    }
 
-        // we now replace all old ini replacements with LESS variables
-        $css = strtr($css, $styleini['replacements']);
+    // we now replace all old ini replacements with LESS variables
+    $css = strtr($css, $replacements);
 
-        // now prepend the list of LESS variables as the very first thing
-        $css = $less.$css;
-    }
+    // now prepend the list of LESS variables as the very first thing
+    $css = $less.$css;
     return $css;
 }
 
 /**
- * Get contents of merged style.ini and style.local.ini as an array.
+ * Load style ini contents
+ *
+ * Loads and merges style.ini files from template and config and prepares
+ * the stylesheet modes
  *
- * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param string $tpl the used template
+ * @return array with keys 'stylesheets' and 'replacements'
  */
-function css_styleini($tplinc) {
-    $styleini = array();
+function css_styleini($tpl) {
+    $stylesheets = array(); // mode, file => base
+    $replacements = array(); // placeholder => value
+
+    // load template's style.ini
+    $incbase = tpl_incdir($tpl);
+    $webbase = tpl_basedir($tpl);
+    $ini = $incbase.'style.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
 
-    foreach (array($tplinc.'style.ini', $tplinc.'style.local.ini') as $ini) {
-        $tmp = (@file_exists($ini)) ? parse_ini_file($ini, true) : array();
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
+        }
+    }
 
-        foreach($tmp as $key => $value) {
-            if(array_key_exists($key, $styleini) && is_array($value)) {
-                $styleini[$key] = array_merge($styleini[$key], $tmp[$key]);
-            } else {
-                $styleini[$key] = $value;
-            }
+    // load configs's style.ini
+    $incbase = dirname($ini).'/';
+    $webbase = DOKU_BASE;
+    $ini = DOKU_CONF."/tpl/$tpl/style.ini";
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
         }
     }
-    return $styleini;
+
+    return array(
+        'stylesheets' => $stylesheets,
+        'replacements' => $replacements
+    );
 }
 
 /**
-- 
cgit v1.2.3


From a5365cbe15702d1211b52128cb0bec6473ba15cc Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Sat, 3 Aug 2013 15:24:42 +0200
Subject: JSINFO in Media Manager: Initialize with empty array, as $ID and $NS
 aren't useful and available. This is just for adding more values in e. g. an
 action plugin.

---
 lib/exe/mediamanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/exe')

diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 7cd91fe8f..d9e4a6b04 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -31,7 +31,7 @@
 
     global $INFO, $JSINFO;
     $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
-    $JSINFO = array('id' => $ID, 'namespace' => $NS);
+    $JSINFO = array('id' => '', 'namespace' => '');
     $AUTH = $INFO['perm'];    // shortcut for historical reasons
 
     trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
-- 
cgit v1.2.3


From 568ffd7ef769ecacdf91ac7bdf01dbcedaf8643a Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 16:25:02 +0200
Subject: Readded style.local.ini and deprecated it

---
 lib/exe/css.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index ce6a83fea..aa82ba9a2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -279,6 +279,23 @@ function css_styleini($tpl) {
         }
     }
 
+    // load template's style.local.ini
+    // @deprecated 2013-08-03
+    $ini = $incbase.'style.local.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, $data['replacements']);
+        }
+    }
+
     // load configs's style.ini
     $incbase = dirname($ini).'/';
     $webbase = DOKU_BASE;
-- 
cgit v1.2.3


From 90e793b91a348ae2876ed14c8b0d0000192d55e5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 3 Aug 2013 22:52:10 +0200
Subject: removed debug statement

---
 lib/exe/css.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index aa82ba9a2..299e1ebcf 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -50,8 +50,6 @@ function css_out(){
     // load styl.ini
     $styleini = css_styleini($tpl);
 
-    print_r($styleini);
-
     // 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'];
-- 
cgit v1.2.3


From 8c5aad7bcd74959cceb191697de486a5f6e98fd7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 22:16:08 +0100
Subject: fixed conf style.ini not working due to wrong incbase path

---
 lib/exe/css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index aa82ba9a2..48304b2b6 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -297,9 +297,9 @@ function css_styleini($tpl) {
     }
 
     // load configs's style.ini
-    $incbase = dirname($ini).'/';
     $webbase = DOKU_BASE;
-    $ini = DOKU_CONF."/tpl/$tpl/style.ini";
+    $ini = DOKU_CONF."tpl/$tpl/style.ini";
+    $incbase = dirname($ini).'/';
     if(file_exists($ini)){
         $data = parse_ini_file($ini, true);
 
-- 
cgit v1.2.3


From 724f299965bd5272d45b883477424bd693c9ce95 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 3 Aug 2013 22:23:37 +0100
Subject: added style.local.ini to cache files

---
 lib/exe/css.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 08dc4d5dd..9e1e22e1a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -59,6 +59,7 @@ function css_out(){
     $tplinc = tpl_basedir($tpl);
     $cache_files = getConfigFiles('main');
     $cache_files[] = $tplinc.'style.ini';
+    $cache_files[] = $tplinc.'style.local.ini'; // @deprecated
     $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
     $cache_files[] = __FILE__;
 
-- 
cgit v1.2.3