[phpwiki-checkins] SF.net SVN: phpwiki:[10998] trunk/lib

[<var...@us...>]

Revision: 10998
          http://sourceforge.net/p/phpwiki/code/10998
Author:   vargenau
Date:     2022-02-15 15:16:11 +0000 (Tue, 15 Feb 2022)
Log Message:
-----------
function getWikiPageLinks returns empty array instead of false

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/WikiPlugin.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2022-02-15 15:10:30 UTC (rev 10997)
+++ trunk/lib/CachedMarkup.php	2022-02-15 15:16:11 UTC (rev 10998)
@@ -253,7 +253,7 @@
 
     function getWikiPageLinks($basepage)
     {
-        return false;
+        return array();
     }
 }
 
@@ -372,14 +372,17 @@
 
     function getWikiPageLinks($basepage)
     {
-        if ($basepage == '')
-            return false;
-        if (isset($this->_nolink))
-            return false;
-        if ($link = $this->getPagename($basepage))
+        if ($basepage == '') {
+            return array();
+        }
+        if (isset($this->_nolink)) {
+            return array();
+        }
+        if ($link = $this->getPagename($basepage)) {
             return array(array('linkto' => $link));
-        else
-            return false;
+        } else {
+            return array();
+        }
     }
 
     function _getName($basepage)
@@ -554,7 +557,9 @@
          */
         global $request;
 
-        if ($basepage == '') return false;
+        if ($basepage == '') {
+            return array();
+        }
         if (!isset($this->_page) and isset($this->_attribute)) {
             // An attribute: we store it in the basepage now, to fill the cache for page->save
             // TODO: side-effect free query
@@ -563,10 +568,11 @@
             $this->_page = $basepage;
             return array(array('linkto' => '', 'relation' => $this->_relation));
         }
-        if ($link = $this->getPagename($basepage))
+        if ($link = $this->getPagename($basepage)) {
             return array(array('linkto' => $link, 'relation' => $this->_relation));
-        else
-            return false;
+        } else {
+            return array();
+        }
     }
 
     function _expandurl($url)

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2022-02-15 15:10:30 UTC (rev 10997)
+++ trunk/lib/WikiPlugin.php	2022-02-15 15:16:11 UTC (rev 10998)
@@ -84,11 +84,11 @@
      *
      * @param  string $argstr   The plugin argument string.
      * @param  string $basepage The pagename the plugin is invoked from.
-     * @return array|false  List of pagenames linked to (or false).
+     * @return array List of pagenames linked to.
      */
     function getWikiPageLinks($argstr, $basepage)
     {
-        return false;
+        return array();
     }
 
     /**
@@ -529,13 +529,16 @@
 
     function getWikiPageLinks($pi, $basepage)
     {
-        if (!($ppi = $this->parsePI($pi)))
-            return false;
+        if (!($ppi = $this->parsePI($pi))) {
+            return array();
+        }
         list($pi_name, $plugin, $plugin_args) = $ppi;
-        if (!is_object($plugin))
-            return false;
-        if ($pi_name != 'plugin')
-            return false;
+        if (!is_object($plugin)) {
+            return array();
+        }
+        if ($pi_name != 'plugin') {
+            return array();
+        }
         return $plugin->getWikiPageLinks($plugin_args, $basepage);
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.