[phpwiki-checkins] SF.net SVN: phpwiki:[8833] trunk/lib/plugin/WikiAdminSelect.php

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

Revision: 8833
          http://sourceforge.net/p/phpwiki/code/8833
Author:   vargenau
Date:     2013-07-18 09:19:23 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
protected

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSelect.php

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-07-17 12:08:03 UTC (rev 8832)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-07-18 09:19:23 UTC (rev 8833)
@@ -62,7 +62,7 @@
      * Default collector for all WikiAdmin* plugins.
      * preSelectS() is similar, but fills $this->_list
      */
-    function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
+    protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '')
     {
         $allPages = $dbi->getAllPages(0, $sortby, $limit, $exclude);
         while ($pagehandle = $allPages->next()) {
@@ -80,17 +80,20 @@
      * 'only: forgot what the difference to 's' was.
      * Sets $this->_list, which is picked up by collectPages() and is a default for p[]
      */
-    function preSelectS(&$args, &$request)
+    protected function preSelectS(&$args, &$request)
     {
         // override plugin argument by GET: probably not needed if s||="" is used
         // anyway, we force it for unique interface.
-        if (!empty($request->getArg['s']))
+        if (!empty($request->getArg['s'])) {
             $args['s'] = $request->getArg['s'];
-        if (!empty($args['owner']))
+        }
+        if (!empty($args['owner'])) {
             $sl = PageList::allPagesByOwner($args['owner'], false, $args['sortby'], $args['limit'], $args['exclude']);
-        elseif (!empty($args['author']))
-            $sl = PageList::allPagesByAuthor($args['author'], false, $args['sortby'], $args['limit'], $args['exclude']); elseif (!empty($args['creator']))
-            $sl = PageList::allPagesByCreator($args['creator'], false, $args['sortby'], $args['limit'], $args['exclude']); elseif (!empty($args['s']) or !empty($args['only'])) {
+        } elseif (!empty($args['author'])) {
+            $sl = PageList::allPagesByAuthor($args['author'], false, $args['sortby'], $args['limit'], $args['exclude']);
+        } elseif (!empty($args['creator'])) {
+            $sl = PageList::allPagesByCreator($args['creator'], false, $args['sortby'], $args['limit'], $args['exclude']);
+        } elseif (!empty($args['s']) or !empty($args['only'])) {
             // all pages by name
             $sl = explodePageList(empty($args['only']) ? $args['s'] : $args['only']);
         }

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