From 823a1e9c4846b9d511e2362f93e9c65c1fcdad78 Mon Sep 17 00:00:00 2001 From: Rob Church Date: Thu, 29 Jun 2006 00:18:30 +0000 Subject: [PATCH] * (bug 6484) Don't do message transformations when preloading messages for editing --- RELEASE-NOTES | 1 + includes/EditPage.php | 2 +- includes/GlobalFunctions.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 358b6f5c7c..33c048708e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -597,6 +597,7 @@ Some default configuration options have changed: * Show some error results in moveBatch.php * (bug 6479) Allow specification of the skin to use during HTML dumps * (bug 6461) Link to page histories in Special:Newpages +* (bug 6484) Don't do message transformations when preloading messages for editing == Compatibility == diff --git a/includes/EditPage.php b/includes/EditPage.php index 47e9b53816..37f8a99ebf 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -737,7 +737,7 @@ class EditPage { $this->textbox1 = $this->mArticle->getContent(); $this->summary = ''; if ( !$this->mArticle->exists() && $this->mArticle->mTitle->getNamespace() == NS_MEDIAWIKI ) - $this->textbox1 = wfMsgWeirdKey ( $this->mArticle->mTitle->getText() ) ; + $this->textbox1 = wfMsgWeirdKey( $this->mArticle->mTitle->getText() ) ; wfProxyCheck(); } diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index d1a23943b8..661b8a6475 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -417,11 +417,11 @@ function wfMsgReal( $key, $args, $useDB = true, $forContent=false, $transform = */ function wfMsgWeirdKey ( $key ) { $subsource = str_replace ( ' ' , '_' , $key ) ; - $source = wfMsg ( $subsource ) ; + $source = wfMsgForContentNoTrans( $subsource ) ; if ( $source == "<{$subsource}>" ) { # Try again with first char lower case $subsource = strtolower ( substr ( $subsource , 0 , 1 ) ) . substr ( $subsource , 1 ) ; - $source = wfMsg ( $subsource ) ; + $source = wfMsgForContentNoTrans( $subsource ) ; } if ( $source == "<{$subsource}>" ) { # Didn't work either, return blank text -- 2.20.1