X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FPrefixSearch.php;h=10c8593055b824441f272b0c7d2ea5238f60cd50;hb=3141337d77504b52045406c540a371f3444d40fc;hp=a3ff05e25c735c79f72b8fd8a4057dbc718faa6a;hpb=d6fd8e7c1345052cfba0f396bbb65b4c93d11366;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index a3ff05e25c..10c8593055 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * PrefixSearch - Handles searching prefixes of titles and finding any page
+ * names that match. Used largely by the OpenSearch implementation.
+ * 
+ * @ingroup Search
+ */
+
 class PrefixSearch {
 	/**
 	 * Do a prefix search of titles and return a list of matching page names.
@@ -48,7 +55,7 @@ class PrefixSearch {
 		if( count($namespaces) == 1 ){
 			$ns = $namespaces[0];
 			if( $ns == NS_MEDIA ) {
-				$namespaces = array(NS_IMAGE);
+				$namespaces = array(NS_FILE);
 			} elseif( $ns == NS_SPECIAL ) {
 				return self::specialSearch( $search, $limit );
 			}
@@ -96,7 +103,9 @@ class PrefixSearch {
 
 	/**
 	 * Unless overridden by PrefixSearchBackend hook...
-	 * This is case-sensitive except the first letter (per $wgCapitalLinks)
+	 * This is case-sensitive (First character may
+	 * be automatically capitalized by Title::secureAndSpit()
+	 * later on depending on $wgCapitalLinks)
 	 *
 	 * @param array $namespaces Namespaces to search in
 	 * @param string $search term
@@ -104,12 +113,6 @@ class PrefixSearch {
 	 * @return array of title strings
 	 */
 	protected static function defaultSearchBackend( $namespaces, $search, $limit ) {
-		global $wgCapitalLinks, $wgContLang;
-
-		if( $wgCapitalLinks ) {
-			$search = $wgContLang->ucfirst( $search );
-		}
-
 		$ns = array_shift($namespaces); // support only one namespace
 		if( in_array(NS_MAIN,$namespaces))
 			$ns = NS_MAIN; // if searching on many always default to main 
@@ -132,7 +135,7 @@ class PrefixSearch {
 
 		// Reformat useful data for future printing by JSON engine
 		$srchres = array ();
-		foreach ($data['query']['allpages'] as & $pageinfo) {
+		foreach ((array)$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'];