Escape $1 in message (was PHP syntax error)

[lhc/web/wiklou.git] / includes / api / ApiOpenSearch.php

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index bfeb2a5..4a673c2 100644 (file)
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -29,7 +29,7 @@ if (!defined('MEDIAWIKI')) {
 }
 
 /**
- * @addtogroup API
+ * @ingroup API
  */
 class ApiOpenSearch extends ApiBase {
 
@@ -44,37 +44,13 @@ class ApiOpenSearch extends ApiBase {
        public function execute() {
                $params = $this->extractRequestParams();
                $search = $params['search'];
-
+               $limit = $params['limit'];
+               $namespaces = $params['namespace'];
+               
                // Open search results may be stored for a very long time
                $this->getMain()->setCacheMaxAge(1200);
 
-               $title = Title :: newFromText($search);
-               if(!$title)
-                       return; // Return empty result
-                       
-               // Prepare nested request
-               $req = new FauxRequest(array (
-                       'action' => 'query',
-                       'list' => 'allpages',
-                       'apnamespace' => $title->getNamespace(),
-                       'aplimit' => $params['limit'],
-                       'apprefix' => $title->getDBkey()
-               ));
-
-               // Execute
-               $module = new ApiMain($req);
-               $module->execute();
-
-               // Get resulting data
-               $data = $module->getResultData();
-
-               // Reformat useful data for future printing by JSON engine
-               $srchres = array ();
-               foreach ($data['query']['allpages'] as & $pageinfo) {
-                       // Note: this data will no be printable by the xml engine
-                       // because it does not support lists of unnamed items
-                       $srchres[] = $pageinfo['title'];
-               }
+               $srchres = PrefixSearch::titleSearch( $search, $limit, $namespaces );
 
                // Set top level elements
                $result = $this->getResult();
@@ -91,14 +67,20 @@ class ApiOpenSearch extends ApiBase {
                                ApiBase :: PARAM_MIN => 1,
                                ApiBase :: PARAM_MAX => 100,
                                ApiBase :: PARAM_MAX2 => 100
-                       )
+                       ),
+                       'namespace' => array(
+                               ApiBase :: PARAM_DFLT => NS_MAIN,
+                               ApiBase :: PARAM_TYPE => 'namespace',
+                               ApiBase :: PARAM_ISMULTI => true
+                       ),
                );
        }
 
        public function getParamDescription() {
                return array (
                        'search' => 'Search string',
-                       'limit' => 'Maximum amount of results to return'
+                       'limit' => 'Maximum amount of results to return',
+                       'namespace' => 'Namespaces to search',
                );
        }
 
@@ -116,4 +98,3 @@ class ApiOpenSearch extends ApiBase {
                return __CLASS__ . ': $Id$';
        }
 }
-