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

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

Revision: 9203
          http://sourceforge.net/p/phpwiki/code/9203
Author:   vargenau
Date:     2014-10-06 17:15:30 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Revert extract arguments by hand

Modified Paths:
--------------
    trunk/lib/plugin/BackLinks.php
    trunk/lib/plugin/CurrentTime.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/IncludePage.php

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/BackLinks.php	2014-10-06 17:15:30 UTC (rev 9203)
@@ -58,17 +58,12 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);
-        $page = $args['page'];
-        $sortby = $args['sortby'];
-        $info = $args['info'];
-        $noheader = $args['noheader'];
-        $include_self = $args['include_self'];
-        $limit = $args['limit'];
-        $exclude = $args['exclude'];
 
+        extract($args);
         if (empty($page) and $page != '0') {
             return '';
         }
+        // exclude is now already expanded in WikiPlugin::getArgs()
         if (empty($exclude)) {
             $exclude = array();
         }

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/CurrentTime.php	2014-10-06 17:15:30 UTC (rev 9203)
@@ -78,8 +78,7 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        $args = $this->getArgs($argstr, $request);
-        $format = $args['format'];
+        extract($this->getArgs($argstr, $request));
 
         if ($format == 'date') {
             $format = '%Y-%m-%d';

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/FullTextSearch.php	2014-10-06 17:15:30 UTC (rev 9203)
@@ -69,26 +69,17 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return $this|bool|HtmlElement|PageList|XmlContent
+     * @return mixed
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        // Extract arguments
         $args = $this->getArgs($argstr, $request);
-        $s = $args['s'];
-        $hilight = $args['hilight'];
-        $case_exact = $args['case_exact'];
-        $regex = $args['regex'];
-        $sortby = $args['sortby'];
-        $noheader = $args['noheader'];
-        $exclude = $args['exclude'];
-        $quiet = $args['quiet'];
-        $limit = $args['limit'];
 
-        if (empty($s)) {
+        if (empty($args['s'])) {
             return HTML::p(array('class' => 'warning'),
                            _("You must enter a search term."));
         }
+        extract($args);
 
         $query = new TextSearchQuery($s, $case_exact, $regex);
         $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2014-10-06 17:12:32 UTC (rev 9202)
+++ trunk/lib/plugin/IncludePage.php	2014-10-06 17:15:30 UTC (rev 9203)
@@ -51,9 +51,10 @@
 
     function getWikiPageLinks($argstr, $basepage)
     {
-        $args = $this->getArgs($argstr);
-        $page = $args['page'];
+        extract($this->getArgs($argstr));
 
+        if (!isset($page))
+            return false;
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
@@ -88,9 +89,7 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         $args = $this->getArgs($argstr, $request);
-        $page = $args['page'];
-        $rev = $args['rev'];
-        $quiet = $args['quiet'];
+        extract($args);
 
         if ($page) {
             // Expand relative page names.
@@ -192,13 +191,7 @@
      */
     protected function extractParts($c, $pagename, $args)
     {
-        $section = $args['section'];
-        $sections = $args['sections'];
-        $lines = $args['lines'];
-        $words = $args['words'];
-        $bytes = $args['bytes'];
-        $quiet = $args['quiet'];
-        $sectionhead = $args['sectionhead'];
+        extract($args);
 
         if ($section) {
             if ($sections) {

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