From 9ebb2dec9cffe32912afd35b2098a4435ae6d42f Mon Sep 17 00:00:00 2001 From: Happy-melon Date: Fri, 26 Mar 2010 11:21:14 +0000 Subject: [PATCH] Get message in wfEmptyMsg using the user's interface language; closer to the previous behaviour and might fix the issue reported in r64178 CR --- includes/EditPage.php | 14 ++++++++------ includes/GlobalFunctions.php | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 0eb5e98a0f..10efc315f2 100644 --- 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 a038fb0a03..762fd1e45d 100644 --- 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; } /** -- 2.20.1