summaryrefslogtreecommitdiff
path: root/inc/parser
diff options
context:
space:
mode:
authorAdrian Lang <lang@cosmocode.de>2010-07-01 13:02:28 +0200
committerAdrian Lang <lang@cosmocode.de>2010-07-01 13:02:28 +0200
commit9708106bad6f238d9aeaccc35258350a66604a6c (patch)
treec8c14e3f3ad2522bf32947b2725001b396f03719 /inc/parser
parentb26cdbbe55ab83f30ecba9deee8b3541cb005a88 (diff)
downloadrpg-9708106bad6f238d9aeaccc35258350a66604a6c.tar.gz
rpg-9708106bad6f238d9aeaccc35258350a66604a6c.tar.bz2
Fix ns: and ns:start handling
Diffstat (limited to 'inc/parser')
-rw-r--r--inc/parser/renderer.php14
1 files changed, 3 insertions, 11 deletions
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);
}
/**