From 9708106bad6f238d9aeaccc35258350a66604a6c Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Thu, 1 Jul 2010 13:02:28 +0200
Subject: Fix ns: and ns:start handling

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

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

diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 4dac75d21..7e52cfce2 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -271,20 +271,12 @@ class Doku_Renderer extends DokuWiki_Plugin {
         list($name,$hash) = explode('#',$name,2);
         if($hash) return $hash;
 
-        //trim colons or slash of a namespace link
-        $name = rtrim($name,':');
-        if($conf['useslash'])
-          $name = rtrim($name,'/');
-
+        $name = strtr($name,';',':');
         if($conf['useslash']){
-            $nssep = '[:;/]';
-        }else{
-            $nssep = '[:;]';
+            $name = strtr($name,'/',':');
         }
-        $name = preg_replace('!.*'.$nssep.'!','',$name);
 
-        if(!$name) return $this->_simpleTitle($conf['start']);
-        return $name;
+        return noNSorNS($name);
     }
 
     /**
-- 
cgit v1.2.3