From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 29 Jun 2006 00:18:30 +0000 (+0000)
Subject: * (bug 6484) Don't do message transformations when preloading messages for editing
X-Git-Tag: 1.31.0-rc.0~56537
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=823a1e9c4846b9d511e2362f93e9c65c1fcdad78;p=lhc%2Fweb%2Fwiklou.git

* (bug 6484) Don't do message transformations when preloading messages for editing
---

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 == "&lt;{$subsource}&gt;" ) {
 		# Try again with first char lower case
 		$subsource = strtolower ( substr ( $subsource , 0 , 1 ) ) . substr ( $subsource , 1 ) ;
-		$source = wfMsg ( $subsource ) ;
+		$source = wfMsgForContentNoTrans( $subsource ) ;
 	}
 	if ( $source == "&lt;{$subsource}&gt;" ) {
 		# Didn't work either, return blank text