From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 includes/PrefixSearch.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'includes/PrefixSearch.php')

diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index d37d9e80..3c464c58 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -37,16 +37,16 @@ class PrefixSearch {
 	 */
 	public static function titleSearch( $search, $limit, $namespaces = array() ) {
 		$search = trim( $search );
-		if( $search == '' ) {
+		if ( $search == '' ) {
 			return array(); // Return empty result
 		}
 		$namespaces = self::validateNamespaces( $namespaces );
 
 		// Find a Title which is not an interwiki and is in NS_MAIN
 		$title = Title::newFromText( $search );
-		if( $title && $title->getInterwiki() == '' ) {
+		if ( $title && $title->getInterwiki() == '' ) {
 			$ns = array( $title->getNamespace() );
-			if( $ns[0] == NS_MAIN ) {
+			if ( $ns[0] == NS_MAIN ) {
 				$ns = $namespaces; // no explicit prefix, use default namespaces
 			}
 			return self::searchBackend(
@@ -55,7 +55,7 @@ class PrefixSearch {
 
 		// Is this a namespace prefix?
 		$title = Title::newFromText( $search . 'Dummy' );
-		if( $title && $title->getText() == 'Dummy'
+		if ( $title && $title->getText() == 'Dummy'
 			&& $title->getNamespace() != NS_MAIN
 			&& $title->getInterwiki() == '' ) {
 			return self::searchBackend(
@@ -73,16 +73,16 @@ class PrefixSearch {
 	 * @return Array of strings
 	 */
 	protected static function searchBackend( $namespaces, $search, $limit ) {
-		if( count( $namespaces ) == 1 ) {
+		if ( count( $namespaces ) == 1 ) {
 			$ns = $namespaces[0];
-			if( $ns == NS_MEDIA ) {
+			if ( $ns == NS_MEDIA ) {
 				$namespaces = array( NS_FILE );
-			} elseif( $ns == NS_SPECIAL ) {
+			} elseif ( $ns == NS_SPECIAL ) {
 				return self::specialSearch( $search, $limit );
 			}
 		}
 		$srchres = array();
-		if( wfRunHooks( 'PrefixSearchBackend', array( $namespaces, $search, $limit, &$srchres ) ) ) {
+		if ( wfRunHooks( 'PrefixSearchBackend', array( $namespaces, $search, $limit, &$srchres ) ) ) {
 			return self::defaultSearchBackend( $namespaces, $search, $limit );
 		}
 		return $srchres;
@@ -106,24 +106,24 @@ class PrefixSearch {
 		// Unlike SpecialPage itself, we want the canonical forms of both
 		// canonical and alias title forms...
 		$keys = array();
-		foreach( SpecialPageFactory::getList() as $page => $class ) {
+		foreach ( SpecialPageFactory::getList() as $page => $class ) {
 			$keys[$wgContLang->caseFold( $page )] = $page;
 		}
 
-		foreach( $wgContLang->getSpecialPageAliases() as $page => $aliases ) {
-			if( !array_key_exists( $page, SpecialPageFactory::getList() ) ) {# bug 20885
+		foreach ( $wgContLang->getSpecialPageAliases() as $page => $aliases ) {
+			if ( !array_key_exists( $page, SpecialPageFactory::getList() ) ) {# bug 20885
 				continue;
 			}
 
-			foreach( $aliases as $alias ) {
+			foreach ( $aliases as $alias ) {
 				$keys[$wgContLang->caseFold( $alias )] = $alias;
 			}
 		}
 		ksort( $keys );
 
 		$srchres = array();
-		foreach( $keys as $pageKey => $page ) {
-			if( $searchKey === '' || strpos( $pageKey, $searchKey ) === 0 ) {
+		foreach ( $keys as $pageKey => $page ) {
+			if ( $searchKey === '' || strpos( $pageKey, $searchKey ) === 0 ) {
 				wfSuppressWarnings();
 				// bug 27671: Don't use SpecialPage::getTitleFor() here because it
 				// localizes its input leading to searches for e.g. Special:All
@@ -133,7 +133,7 @@ class PrefixSearch {
 				wfRestoreWarnings();
 			}
 
-			if( count( $srchres ) >= $limit ) {
+			if ( count( $srchres ) >= $limit ) {
 				break;
 			}
 		}
@@ -154,7 +154,7 @@ class PrefixSearch {
 	 */
 	protected static function defaultSearchBackend( $namespaces, $search, $limit ) {
 		$ns = array_shift( $namespaces ); // support only one namespace
-		if( in_array( NS_MAIN, $namespaces ) ) {
+		if ( in_array( NS_MAIN, $namespaces ) ) {
 			$ns = NS_MAIN; // if searching on many always default to main
 		}
 
@@ -175,7 +175,7 @@ class PrefixSearch {
 		$data = $module->getResultData();
 
 		// Reformat useful data for future printing by JSON engine
-		$srchres = array ();
+		$srchres = array();
 		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
@@ -196,14 +196,14 @@ class PrefixSearch {
 
 		// We will look at each given namespace against wgContLang namespaces
 		$validNamespaces = $wgContLang->getNamespaces();
-		if( is_array( $namespaces ) && count( $namespaces ) > 0 ) {
+		if ( is_array( $namespaces ) && count( $namespaces ) > 0 ) {
 			$valid = array();
 			foreach ( $namespaces as $ns ) {
-				if( is_numeric( $ns ) && array_key_exists( $ns, $validNamespaces ) ) {
+				if ( is_numeric( $ns ) && array_key_exists( $ns, $validNamespaces ) ) {
 					$valid[] = $ns;
 				}
 			}
-			if( count( $valid ) > 0 ) {
+			if ( count( $valid ) > 0 ) {
 				return $valid;
 			}
 		}
-- 
cgit v1.2.2