From e8b5a4f91c8a6e230a6cfe13c43dc9ddce31e253 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 28 Jul 2012 12:02:06 +0200
Subject: fix E_STRICT errors FS#2427

This commit fixes all E_STRICT messages shown when running the test
suite. There might be more problems not covered by tests, yet.

For compatibility reasons with plugins, E_STRICT errors are still
supressed.
---
 inc/parser/renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 0923e6896..2c78f220a 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -62,7 +62,7 @@ class Doku_Renderer extends DokuWiki_Plugin {
 
     //handle plugin rendering
     function plugin($name,$data){
-        $plugin =& plugin_load('syntax',$name);
+        $plugin = plugin_load('syntax',$name);
         if($plugin != null){
             $plugin->render($this->getFormat(),$this,$data);
         }
-- 
cgit v1.2.3


From 3755fc25fd2934f8d887f713a48b342ef252cfee Mon Sep 17 00:00:00 2001
From: Tom N Harris <tnharris@whoopdedo.org>
Date: Mon, 14 Mar 2011 20:39:30 -0400
Subject: Combine subsequent calls to strtr into a single transformation

---
 inc/parser/renderer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'inc/parser/renderer.php')

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 2c78f220a..7df369478 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -274,9 +274,10 @@ class Doku_Renderer extends DokuWiki_Plugin {
         list($name,$hash) = explode('#',$name,2);
         if($hash) return $hash;
 
-        $name = strtr($name,';',':');
         if($conf['useslash']){
-            $name = strtr($name,'/',':');
+            $name = strtr($name,';/',';:');
+        }else{
+            $name = strtr($name,';',':');
         }
 
         return noNSorNS($name);
-- 
cgit v1.2.3