Get message in wfEmptyMsg using the user's interface language; closer to the previous...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0eb5e98..10efc31 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1704,14 +1704,16 @@ INPUTS
                }
        }
 
+       /**
+        * Give a chance for site and per-namespace customizations of
+        * terms of service summary link that might exist separately
+        * from the copyright notice.
+        * 
+        * This will display between the save button and the edit tools,
+        * so should remain short!
+        */
        protected function showTosSummary() {
                $msg = 'editpage-tos-summary';
-               // Give a chance for site and per-namespace customizations of
-               // terms of service summary link that might exist separately
-               // from the copyright notice.
-               //
-               // This will display between the save button and the edit tools,
-               // so should remain short!
                wfRunHooks( 'EditPageTosSummary', array( $this->mTitle, &$msg ) );
                $text = wfMsg( $msg );
                if( !wfEmptyMsg( $msg, $text ) && $text !== '-' ) {

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a038fb0..762fd1e 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2274,7 +2274,7 @@ function wfAppendToArrayIfNotDefault( $key, $value, $default, &$changed ) {
  */
 function wfEmptyMsg( $key ) {
        global $wgMessageCache;
-       return $wgMessageCache->get( $key ) === false;
+       return $wgMessageCache->get( $key, /*useDB*/true, /*content*/false ) === false;
 }
 
 /**