Changeset 30226 for documentation/trunk/wiki

Timestamp:

2015-09-08T15:49:20+12:00 (9 years ago)

Author:

jmt12

Message:

Fixing two bugs - one that prevents a blank namespace restriction working and a second that meant updating internal links only worked if there were also bogus image reference tags to fix

File:

• documentation/trunk/wiki/plugins/greenstonedocs/syntax.php (modified) (3 diffs)

documentation/trunk/wiki/plugins/greenstonedocs/syntax.php

@@ -74 +74 @@
         {
             // Determine the starting point for the update
-            $base_dir = DOKU_INC . 'data/pages/' . $this->getConf('currentnamespace') . '/';
+            $base_dir = DOKU_INC . 'data/pages/';
+            if (!empty($this->getConf('currentnamespace')))
+            {
+                $base_dir .= $this->getConf('currentnamespace') . '/';
+            }
             // - ensure trailing : for consistency in namespaces
             $current_namespace = $this->getConf('currentnamespace');
@@ -173 +177 @@
                 $pattern = '/(<imgcaption .+?>)(<\/imgcaption>)\s*(\{\{.+?\}\})/s';
                 $replace = '${1}${3}${2}';
-                $page_content = preg_replace($pattern, $replace, $page_content, -1, $replace_count);
+                $image_replace_count = 0;
+                $page_content = preg_replace($pattern, $replace, $page_content, -1, $image_replace_count);
+                $replace_count = $replace_count + $image_replace_count;
                 if ($replace_count > 0)
                 {
@@ -209 +215 @@
         // Note that the result is FALSE if no match, and should be 0 if name-
         // space starts with prefix.
-        if (strpos($current_full_namespace, $this->target_namespace_prefix) === 0)
+        if (empty($this->target_namespace_prefix) || strpos($current_full_namespace, $this->target_namespace_prefix) === 0)
         {
             // Hiding the section/translation ID tags in headers