From 52d0148474bfc6e31d42aee59d7b709e2b3e561a Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 12 Jan 2019 20:21:02 +0900 Subject: [PATCH] Revert "Relative path ".:" does not work (2nd revised) close #95" This reverts commit ab67127909792fbee10efaab5714434133385d71. --- syntax/archive.php | 7 ------- syntax/autoarchive.php | 7 ------- syntax/blog.php | 7 ------- 3 files changed, 21 deletions(-) diff --git a/syntax/archive.php b/syntax/archive.php index c3c8169..f21da11 100644 --- a/syntax/archive.php +++ b/syntax/archive.php @@ -53,13 +53,6 @@ function handle($match, $state, $pos, Doku_Handler $handler) { if ($ns == '') $ns = cleanID($this->getConf('namespace')); elseif (($ns == '*') || ($ns == ':')) $ns = ''; elseif ($ns == '.') $ns = getNS($ID); - elseif (preg_match('/^\.:/', $ns)){ - if (getNS(getID())) { - $ns = getNS($ID) . ltrim($ns, "."); - } else { - $ns = ltrim($ns, ".:"); - } - } else $ns = cleanID($ns); // daily archive diff --git a/syntax/autoarchive.php b/syntax/autoarchive.php index 839bcdb..5139fcf 100644 --- a/syntax/autoarchive.php +++ b/syntax/autoarchive.php @@ -37,13 +37,6 @@ function handle($match, $state, $pos, Doku_Handler $handler) { if ($ns == '') $ns = cleanID($this->getConf('namespace')); elseif (($ns == '*') || ($ns == ':')) $ns = ''; elseif ($ns == '.') $ns = getNS($ID); - elseif (preg_match('/^\.:/', $ns)){ - if (getNS(getID())) { - $ns = getNS($ID) . ltrim($ns, "."); - } else { - $ns = ltrim($ns, ".:"); - } - } else $ns = cleanID($ns); return array($ns, $flags, $refine, $pos); diff --git a/syntax/blog.php b/syntax/blog.php index 325b1c2..4311330 100644 --- a/syntax/blog.php +++ b/syntax/blog.php @@ -49,13 +49,6 @@ function handle($match, $state, $pos, Doku_Handler $handler) { if ($ns == '') $ns = cleanID($this->getConf('namespace')); elseif (($ns == '*') || ($ns == ':')) $ns = ''; elseif ($ns == '.') $ns = getNS($ID); - elseif (preg_match('/^\.:/', $ns)){ - if (getNS(getID())) { - $ns = getNS($ID) . ltrim($ns, "."); - } else { - $ns = ltrim($ns, ".:"); - } - } else $ns = cleanID($ns); return array($ns, $num, $flags, $refine);