From e988c1764f4920566863c1a4f3a4e50ab39cfe63 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 21 Feb 2017 13:03:41 +0100
Subject: [PATCH] fix problems with ini handling in svg dispatch

---
 svg.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/svg.php b/svg.php
index f1c5d0a..1fab9c2 100644
--- a/svg.php
+++ b/svg.php
@@ -125,11 +125,12 @@ class SVG {
      * Generate and output
      */
     public function out() {
+        global $conf;
         $file = $this->file;
         $params = $this->getParameters();
 
         header('Content-Type: image/svg+xml');
-        $cachekey = md5($file . serialize($params) . filemtime(__FILE__));
+        $cachekey = md5($file . serialize($params) . $conf['template'] . filemtime(__FILE__));
         $cache = new \cache($cachekey, '.svg');
         $cache->_event = 'SVG_CACHE';
 
@@ -250,8 +251,8 @@ class SVG {
      * @param string $color
      * @return string
      */
-    protected function fixColor($color, $ini = true) {
-
+    protected function fixColor($color) {
+        if($color === '') return '';
         if(preg_match('/^([0-9a-f])([0-9a-f])([0-9a-f])$/i', $color, $m)) {
             $r = hexdec($m[1] . $m[1]);
             $g = hexdec($m[2] . $m[2]);
@@ -267,11 +268,9 @@ class SVG {
                 $a = hexdec('ff');
             }
         } else {
-            if($ini) {
-                if(!$this->replacements) $this->initReplacements();
-                if(isset($this->replacements[$color])) {
-                    return $this->replacements[$color];
-                }
+            if(is_null($this->replacements)) $this->initReplacements();
+            if(isset($this->replacements[$color])) {
+                return $this->replacements[$color];
             }
             return '';
         }
@@ -316,7 +315,7 @@ class SVG {
         global $conf;
         define('SIMPLE_TEST', 1); // hacky shit
         include DOKU_INC . 'lib/exe/css.php';
-        $ini = css_styleini($conf['tpl']);
+        $ini = css_styleini($conf['template']);
         $this->replacements = $ini['replacements'];
     }
 }