Changeset 30310

Timestamp:

2015-11-04T13:59:07+13:00 (8 years ago)

Author:

jmt12

Message:

Replaced conditional using the result of function calls, with a version that stores intermediate results in a variable before comparison in order to be compatible with PHP 5.3.3

File:

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

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

@@ -34 +34 @@
 
         $this->target_namespace_prefix = $this->getConf('currentnamespace');
-
         // Prerequisite testing. Ensure the following list of plugins are also
         // installed and complain otherwise.
@@ -71 +70 @@
         // matically update the internal links within the Greenstone wiki pages
         // to have a different base namespace
-        if ($this->getConf('updatenamespace'))
+        $update_namespace = $this->getConf('updatenamespace');
+        if ($update_namespace != 0)
         {
             // Determine the starting point for the update
             $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');
+            if (!empty($current_namespace))
+            {
+                $base_dir .= $current_namespace . '/';
+            }
             if (strlen($current_namespace) > 0 && substr($current_namespace, -1) != ':')
             {