Fix namespace links and titles (FS 1005, 1006)

darcs-hash:20070217220746-19e2d-76c857902d24301707eb783ced96f25c00526659.gz

2 files changed, 5 insertions, 3 deletions

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 69e04f489..6471413b6 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -341,8 +341,8 @@ function resolve_pageid($ns,&$page,&$exists){
   // get filename (calls clean itself)
   $file = wikiFN($page);
 
-  // if ends with colon we have a namespace link
-  if(substr($page,-1) == ':'){
+  // if ends with colon or slash we have a namespace link
+  if(substr($page,-1) == ':' || ($conf['useslash'] && substr($page,-1) == '/')){
     if(@file_exists(wikiFN($page.$conf['start']))){
       // start page inside namespace
       $page = $page.$conf['start'];
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index a6bf0c543..0e6fa2d85 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -245,8 +245,10 @@ class Doku_Renderer extends DokuWiki_Plugin {
         list($name,$hash) = explode('#',$name,2);
         if($hash) return $hash;
 
-        //trim colons of a namespace link
+        //trim colons or slash of a namespace link
         $name = rtrim($name,':');
+        if($conf['useslash'])
+          $name = rtrim($name,'/');
 
         if($conf['useslash']){
             $nssep = '[:;/]';