From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/parser/CoreLinkFunctions.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'includes/parser/CoreLinkFunctions.php')

diff --git a/includes/parser/CoreLinkFunctions.php b/includes/parser/CoreLinkFunctions.php
index 4bfa9d35..1cabf766 100644
--- a/includes/parser/CoreLinkFunctions.php
+++ b/includes/parser/CoreLinkFunctions.php
@@ -47,15 +47,15 @@ class CoreLinkFunctions {
 	 */
 	static function defaultLinkHook( $parser, $holders, $markers,
 			Title $title, $titleText, &$displayText = null, &$leadingColon = false ) {
-		if( isset($displayText) && $markers->findMarker( $displayText ) ) {
+		if( isset( $displayText ) && $markers->findMarker( $displayText ) ) {
 			# There are links inside of the displayText
 			# For backwards compatibility the deepest links are dominant so this
 			# link should not be handled
-			$displayText = $markers->expand($displayText);
+			$displayText = $markers->expand( $displayText );
 			# Return false so that this link is reverted back to WikiText
 			return false;
 		}
-		return $holders->makeHolder( $title, isset($displayText) ? $displayText : $titleText, array(), '', '' );
+		return $holders->makeHolder( $title, isset( $displayText ) ? $displayText : $titleText, array(), '', '' );
 	}
 
 	/**
@@ -73,15 +73,15 @@ class CoreLinkFunctions {
 		global $wgContLang;
 		# When a category link starts with a : treat it as a normal link
 		if( $leadingColon ) return true;
-		if( isset($sortText) && $markers->findMarker( $sortText ) ) {
+		if( isset( $sortText ) && $markers->findMarker( $sortText ) ) {
 			# There are links inside of the sortText
 			# For backwards compatibility the deepest links are dominant so this
 			# link should not be handled
-			$sortText = $markers->expand($sortText);
+			$sortText = $markers->expand( $sortText );
 			# Return false so that this link is reverted back to WikiText
 			return false;
 		}
-		if( !isset($sortText) ) $sortText = $parser->getDefaultSort();
+		if( !isset( $sortText ) ) $sortText = $parser->getDefaultSort();
 		$sortText = Sanitizer::decodeCharReferences( $sortText );
 		$sortText = str_replace( "\n", '', $sortText );
 		$sortText = $wgContLang->convertCategoryKey( $sortText );
-- 
cgit v1.2.3-54-g00ecf