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

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

Revision: 8889
          http://sourceforge.net/p/phpwiki/code/8889
Author:   vargenau
Date:     2014-06-11 16:20:15 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Remove unused argument

Modified Paths:
--------------
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/SyncWiki.php

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/ExternalSearch.php	2014-06-11 16:20:15 UTC (rev 8889)
@@ -42,7 +42,7 @@
         //fixme: better description
     }
 
-    private function getInterWikiUrl(&$request)
+    private function getInterWikiUrl()
     {
         $intermap = getInterwikiMap();
         $map = $intermap->_map;
@@ -83,7 +83,7 @@
         if (in_array('url', array_keys($posted))) {
             $s = $posted['s'];
             $this->_url = $posted['url'];
-            $this->getInterWikiUrl($request);
+            $this->getInterWikiUrl();
             if (strstr($this->_url, '%s')) {
                 $this->_url = sprintf($this->_url, $s);
             } else
@@ -99,7 +99,7 @@
         if ($formsize < 1)
             $formsize = 30;
         $this->_url = $url;
-        $this->getInterWikiUrl($request);
+        $this->getInterWikiUrl();
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 //'class'  => 'class', //fixme

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/SyncWiki.php	2014-06-11 16:20:15 UTC (rev 8889)
@@ -116,7 +116,6 @@
             //$ol = HTML::ol();
             $done = array();
             foreach ($pagelist as $ext) {
-                $reaction = _("<unknown>");
                 // compare existance and dates with local page
                 $extdate = iso8601_decode($ext['lastModified']->scalar, 1);
                 // TODO: urldecode ???
@@ -130,7 +129,7 @@
                     // check date of latest revision if there's one, and > mergepoint
                     if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
                         // our was deleted after sync, and changed after last sync.
-                        $this->_addConflict('delete', $args, $our, $extdate);
+                        $this->_addConflict('delete', $args, $our);
                         $reaction = (_(" skipped") . " (" . "locally deleted or moved" . ")");
                     } else {
                         $reaction = $this->_import($args, $our, $extdate);
@@ -143,14 +142,14 @@
                     } elseif ($extdate > $ourdate and $ourdate >= $merge_point) {
                         $rel = '>';
                         // our is older then external but newer than last sync
-                        $reaction = $this->_addConflict('import', $args, $our, $extdate);
+                        $reaction = $this->_addConflict('import', $args, $our);
                     } elseif ($extdate < $ourdate and $extdate < $merge_point) {
                         $rel = '>';
                         $reaction = $this->_export($args, $our);
                     } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
                         $rel = '>';
                         // our is newer and external is also newer
-                        $reaction = $this->_addConflict('export', $args, $our, $extdate);
+                        $reaction = $this->_addConflict('export', $args, $our);
                     } else {
                         $rel = '==';
                         $reaction = _("same date");
@@ -193,7 +192,7 @@
                         $reaction = $this->_export($args, $our);
                     } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
                         // our newer and external newer
-                        $reaction = $this->_addConflict($args, $our, $extdate);
+                        $reaction = $this->_addConflict('', $args, $our);
                     }
                 } else {
                     $reaction = 'xmlrpc error';
@@ -260,7 +259,7 @@
         closedir($dh);
     }
 
-    private function _addConflict($what, $args, $our, $extdate = null)
+    private function _addConflict($what, $args, $our)
     {
         $pagename = $our->getName();
         $meb = Button(array('action' => $args['action'],

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