Relative path ".:" does not work (3rd revised) close dokufreaks#95

shimmtak · Jan 12, 2019 · f80c06a · f80c06a
1 parent 52d0148
commit f80c06a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/syntax/archive.php b/syntax/archive.php
@@ -53,6 +53,13 @@ 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($ID)) {
+                $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
@@ -37,6 +37,13 @@ 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($ID)) {
+                $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
@@ -49,6 +49,13 @@ 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($ID)) {
+                $ns = getNS($ID) . ltrim($ns, ".");
+            } else {
+                $ns = ltrim($ns, ".:");
+            }
+        }
         else $ns = cleanID($ns);
 
         return array($ns, $num, $flags, $refine);