Skip to content
Snippets Groups Projects
Commit 1179df0e authored by Guy Brand's avatar Guy Brand
Browse files

Fix namespace links and titles (FS 1005, 1006)

darcs-hash:20070217220746-19e2d-76c857902d24301707eb783ced96f25c00526659.gz
parent ece9fa7a
No related branches found
No related tags found
No related merge requests found
......@@ -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'];
......
......@@ -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 = '[:;/]';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment