From 5a759ff0fbc9b799006be6b412bd5a54aef5f7c5 Mon Sep 17 00:00:00 2001 From: vargenau Date: Thu, 18 Jul 2013 09:19:23 +0000 Subject: [PATCH] protected git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8833 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/plugin/WikiAdminSelect.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/plugin/WikiAdminSelect.php b/lib/plugin/WikiAdminSelect.php index aed2459a0..fdecc0822 100644 --- a/lib/plugin/WikiAdminSelect.php +++ b/lib/plugin/WikiAdminSelect.php @@ -62,7 +62,7 @@ class WikiPlugin_WikiAdminSelect * 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 @@ class WikiPlugin_WikiAdminSelect * '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']); } -- 2.42.0