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

diff --git a/languages/Language.php b/languages/Language.php
index f19a5ca..a18598f 100644 (file)
--- 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 7d99d11..91ec82f 100644 (file)
--- 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 ) {