[phpwiki-checkins] SF.net SVN: phpwiki:[9147] trunk/lib/plugin/FullTextSearch.php

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

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

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

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2014-10-01 13:47:15 UTC (rev 9146)
+++ trunk/lib/plugin/FullTextSearch.php	2014-10-01 14:18:44 UTC (rev 9147)
@@ -64,15 +64,30 @@
          return $args;
     }
 
+    /**
+     * @param WikiDB $dbi
+     * @param string $argstr
+     * @param WikiRequest $request
+     * @param string $basepage
+     * @return $this|bool|HtmlElement|PageList|XmlContent
+     */
     function run($dbi, $argstr, &$request, $basepage)
     {
-
+        // Extract arguments
         $args = $this->getArgs($argstr, $request);
+        $s = $args['s'];
+        $case_exact = $args['case_exact'];
+        $regex = $args['regex'];
+        $sortby = $args['sortby'];
+        $limit = $args['limit'];
+        $exclude = $args['exclude'];
+        $hilight = $args['hilight'];
+        $quiet = $args['quiet'];
+        $noheader = $args['noheader'];
 
-        if (empty($args['s'])) {
+        if (empty($s)) {
             return HTML();
         }
-        extract($args);
 
         $query = new TextSearchQuery($s, $case_exact, $regex);
         $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);
@@ -124,6 +139,11 @@
             $list);
     }
 
+    /**
+     * @param WikiDB_Page $page
+     * @param string $hilight_re
+     * @return array
+     */
     function showhits($page, $hilight_re)
     {
         $current = $page->getCurrentRevision();

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