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

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

Revision: 10155
          http://sourceforge.net/p/phpwiki/code/10155
Author:   vargenau
Date:     2020-03-23 11:59:33 +0000 (Mon, 23 Mar 2020)
Log Message:
-----------
make sure overriden functions have same signatures (and default arguments) as in base class -- patches by Christof Meerwald

Modified Paths:
--------------
    trunk/lib/RssWriter.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/diff.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/RssWriter.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -277,7 +277,7 @@
      * @param bool $uri
      * @return XmlElement
      */
-    function __node($type, $attr, $properties, $uri = false)
+    function __atom_node($type, $attr, $properties, $uri = false)
     {
         if (!$uri)
             $uri = $properties['link'];
@@ -292,7 +292,7 @@
     //  comment
     function addItem($properties, $attr = false, $uri = false)
     {
-        $this->_items[] = $this->__node('entry', $attr, $properties, $uri);
+        $this->_items[] = $this->__atom_node('entry', $attr, $properties, $uri);
     }
 
     /**

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -726,7 +726,7 @@
         $this->_options = $options;
         if ($pages) {
             if (!empty($options['sortby'])) {
-                $sortby = WikiDB_backend::sortby($options['sortby'], 'db',
+                $sortby = $backend->sortby($options['sortby'], 'db',
                     array('pagename', 'mtime'));
                 // check for which column to sortby
                 if ($sortby and !strstr($sortby, "hits ")) {

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/diff.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -185,7 +185,7 @@
         unset($this->block);
     }
 
-    protected function lines($lines, $class, $prefix = false, $elem = false)
+    protected function html_lines($lines, $class, $prefix = false, $elem = false)
     {
         if (!$prefix)
             $prefix = HTML::raw(' ');
@@ -203,24 +203,24 @@
 
     protected function context($lines)
     {
-        $this->lines($lines, 'context');
+        $this->html_lines($lines, 'context');
     }
 
     protected function deleted($lines)
     {
-        $this->lines($lines, 'deleted', '-', 'del');
+        $this->html_lines($lines, 'deleted', '-', 'del');
     }
 
     protected function added($lines)
     {
-        $this->lines($lines, 'added', '+', 'ins');
+        $this->html_lines($lines, 'added', '+', 'ins');
     }
 
     protected function changed($orig, $final)
     {
         $diff = new WordLevelDiff($orig, $final);
-        $this->lines($diff->orig(), 'original', '-');
-        $this->lines($diff->finalize(), 'final', '+');
+        $this->html_lines($diff->orig(), 'original', '-');
+        $this->html_lines($diff->finalize(), 'final', '+');
     }
 }
 

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/plugin/SemanticSearch.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -89,7 +89,7 @@
             ));
     }
 
-    function showForm(&$dbi, &$request, $args)
+    function showForm(&$dbi, &$request, $args, $allrelations = array())
     {
         $action = $request->getPostURL();
         $hiddenfield = HiddenInputs($request->getArgs(), '',

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -82,7 +82,7 @@
             ));
     }
 
-    function showForm(&$dbi, &$request, $args, $allrelations)
+    function showForm(&$dbi, &$request, $args, $allrelations = array())
     {
         $action = $request->getPostURL();
         $hiddenfield = HiddenInputs($request->getArgs(), '',

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/plugin/VisualWiki.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -419,7 +419,7 @@
      *                          'number': label by unique number
      * @return bool error status; true=ok; false=error
      */
-    function createDotFile($filename, $argarray)
+    function createDotFile($filename = '', $argarray = array())
     {
         extract($argarray);
         if (!$fp = fopen($filename, 'w'))

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2020-03-23 11:21:53 UTC (rev 10154)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2020-03-23 11:59:33 UTC (rev 10155)
@@ -100,7 +100,7 @@
         $pagelist->addPageList($pages);
         $button_label_liberal = _("Set Liberal Access Rights");
         $button_label_restrictive = _("Set Restrictive Access Rights");
-        $header = $this->setaclForm($header, $pages);
+        $header = $this->setaclFormSimple($header, $pages);
         $header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
 
         $buttons = HTML::p(Button('submit:admin_setacl[aclliberal]', $button_label_liberal, 'wikiadmin'),
@@ -174,7 +174,7 @@
         return $perm;
     }
 
-    function setaclForm(&$header, $pagehash)
+    function setaclFormSimple(&$header, $pagehash)
     {
 
         $pages = array();

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