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

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

Revision: 9154
          http://sourceforge.net/p/phpwiki/code/9154
Author:   vargenau
Date:     2014-10-01 16:45:10 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Extract arguments by hand

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

Modified: trunk/lib/plugin/BackLinks.php
===================================================================
--- trunk/lib/plugin/BackLinks.php	2014-10-01 16:44:17 UTC (rev 9153)
+++ trunk/lib/plugin/BackLinks.php	2014-10-01 16:45:10 UTC (rev 9154)
@@ -58,22 +58,33 @@
     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')
+        if (empty($page) and $page != '0') {
             return '';
-        // exclude is now already expanded in WikiPlugin::getArgs()
-        if (empty($exclude)) $exclude = array();
-        if (!$include_self)
+        }
+        if (empty($exclude)) {
+            $exclude = array();
+        }
+        if (!$include_self) {
             $exclude[] = $page;
+        }
         if ($info) {
             $info = explode(",", $info);
-            if (in_array('count', $info))
+            if (in_array('count', $info)) {
                 $args['types']['count'] =
                     new _PageList_Column_BackLinks_count('count', _("#"), 'center');
+            }
         }
-        if (!empty($limit))
+        if (!empty($limit)) {
             $args['limit'] = $limit;
+        }
         // $args['dosort'] = !empty($args['sortby']); // override DB sort (??)
         $pagelist = new PageList($info, $exclude, $args);
 

Modified: trunk/lib/plugin/CurrentTime.php
===================================================================
--- trunk/lib/plugin/CurrentTime.php	2014-10-01 16:44:17 UTC (rev 9153)
+++ trunk/lib/plugin/CurrentTime.php	2014-10-01 16:45:10 UTC (rev 9154)
@@ -78,7 +78,8 @@
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-        extract($this->getArgs($argstr, $request));
+        $args = $this->getArgs($argstr, $request);
+        $format = $args['format'];
 
         if ($format == 'date') {
             $format = '%Y-%m-%d';

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

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