From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Sun, 9 Oct 2005 20:23:46 +0000 (+0000)
Subject: * the linkTrail language function should be used to get the linktrail
X-Git-Tag: 1.6.0~1490
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=2334b27a95874c868d6fdfeb5b0383f20615f42d;p=lhc%2Fweb%2Fwiklou.git

* the linkTrail language function should be used to get the linktrail
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 044e2a890c..84e1bdaefd 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -584,7 +584,7 @@ class Linker {
 	}
 	
 	/** @todo document */
-	function makeMediaLink( $name, $url, $alt = '' ) {
+	function makeMediaLink( $name, /* wtf?! */ $url, $alt = '' ) {
 		$nt = Title::makeTitleSafe( NS_IMAGE, $name );
 		return $this->makeMediaLinkObj( $nt, $alt );
 	}
@@ -716,7 +716,7 @@ class Linker {
 				$thelink = $this->makeMediaLink( $submatch[1], "", $text );
 			} else {
 				# Other kind of link
-				if( preg_match( wfMsgForContent( "linktrail" ), $match[4], $submatch ) ) {
+				if( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) {
 					$trail = $submatch[1];
 				} else {
 					$trail = "";