From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 22 Jun 2005 06:28:29 +0000 (+0000)
Subject: Don't suppress warnings -- fix the buggy file.
X-Git-Tag: 1.5.0beta1~95
X-Git-Url: https://git.cyclocoop.org/admin/%7B%24admin_url%7Dmembres/%24self&var_mode_objet=%24skel&var_mode_affiche=squelette&var_mode_ligne=%24ligne?a=commitdiff_plain;h=450bd4df92ded7e5b3080a387e190cde521474a7;p=lhc%2Fweb%2Fwiklou.git

Don't suppress warnings -- fix the buggy file.
---

diff --git a/languages/Language.php b/languages/Language.php
index f19a5ca8e3..a18598f3bb 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2877,11 +2877,7 @@ class Language {
 	 * @access public
 	 */
 	function linkTrail() {
-		wfSuppressWarnings(); // In case there is no trail for the content language (like for Arabic)
-		$trail = $this->getMessage( 'linktrail' );
-		wfRestoreWarnings();
-		if( empty( $trail ) ) $trail = Language::linkTrail();
-		return $trail;
+		return $this->getMessage( 'linktrail' );
 	}
 
 	function getLangObj() {
diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php
index 7d99d11bb3..91ec82f705 100644
--- a/languages/LanguageAr.php
+++ b/languages/LanguageAr.php
@@ -119,11 +119,12 @@ class LanguageAr extends LanguageUtf8 {
 	}
 
 	function getMessage( $key ) {
-		global $wgAllMessagesAr, $wgAllMessagesEn;
-		$m = $wgAllMessagesAr[$key];
-
-		if ( '' == $m ) { return $wgAllMessagesEn[$key]; }
-		else return $m;
+		global $wgAllMessagesAr;
+		if( isset( $wgAllMessagesAr[$key] ) ) {
+			return $wgAllMessagesAr[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
 	}
 
 	function formatNum( $number ) {