[phpwiki-checkins] SF.net SVN: phpwiki:[8964] trunk

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

Revision: 8964
          http://sourceforge.net/p/phpwiki/code/8964
Author:   vargenau
Date:     2014-07-16 13:53:10 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
Make <?plugin-form TitleSearch ?> work

Modified Paths:
--------------
    trunk/lib/plugin/TitleSearch.php
    trunk/pgsrc/Help%2FTitleSearchPlugin

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2014-07-15 16:37:05 UTC (rev 8963)
+++ trunk/lib/plugin/TitleSearch.php	2014-07-16 13:53:10 UTC (rev 8964)
@@ -47,8 +47,8 @@
 
     function getDefaultArguments()
     {
-        return array_merge
-        (
+        // All PageList::supportedArgs, except 'pagename'
+        $args = array_merge(
             PageList::supportedArgs(), // paging and more.
             array('s' => false,
                 'auto_redirect' => false,
@@ -59,6 +59,8 @@
                 'regex' => 'auto',
                 'format' => false,
             ));
+         unset($args['pagename']);
+         return $args;
     }
 
     // info arg allows multiple columns
@@ -72,6 +74,10 @@
             return HTML();
         }
 
+        if (empty($args['sortby'])) {
+            $args['sortby'] = '';
+        }
+
         // ^S != S*   ^  matches only beginning of phrase, not of word.
         //            x* matches any word beginning with x
         $query = new TextSearchQuery($args['s'], $args['case_exact'], $args['regex']);

Modified: trunk/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FTitleSearchPlugin	2014-07-15 16:37:05 UTC (rev 8963)
+++ trunk/pgsrc/Help%2FTitleSearchPlugin	2014-07-16 13:53:10 UTC (rev 8964)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Wed, 16 Jul 2014 15:48:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTitleSearchPlugin;
@@ -18,7 +18,8 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones:
+All [[Help:PageList|PageList]] arguments (except //paganame//),
+plus the following ones:
 
 {| class="bordered"
 |-

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