From: Rob Church <robchurch@users.mediawiki.org>
Date: Mon, 15 May 2006 01:11:06 +0000 (+0000)
Subject: Rename conflicting metadata help message to "metadata_help" (was "metadata") and... 
X-Git-Tag: 1.31.0-rc.0~57134
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=6ec9533b70bcabe5a7d6fe6b8fa2b7dc037fb1aa;p=lhc%2Fweb%2Fwiklou.git

Rename conflicting metadata help message to "metadata_help" (was "metadata") and treat it as wiki text; effectively renders bug 5953 a non-issue
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e153091aef..68966d73bf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -269,6 +269,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5950) Improvements to French localisation
 * (bug 5805) {{plural:}} support for counters in some special pages
 * (bug 5952) Improvement to German localisation (de)
+* Rename conflicting metadata help message to "metadata_help" (was "metadata")
+  and treat it as wiki text
 
 == Compatibility ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index abb5e16f8d..a8a72853ef 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -944,8 +944,7 @@ class EditPage {
 		if ( $wgUseMetadataEdit ) {
 			$metadata = $this->mMetaData ;
 			$metadata = htmlspecialchars( $wgContLang->recodeForEdit( $metadata ) ) ;
-			$helppage = Title::newFromText( wfMsg( "metadata_page" ) ) ;
-			$top = wfMsg( 'metadata', $helppage->getLocalURL() );
+			$top = wfMsgWikiHtml( 'metadata_help' );
 			$metadata = $top . "<textarea name='metadata' rows='3' cols='{$cols}'{$ew}>{$metadata}</textarea>" ;
 		}
 		else $metadata = "" ;
diff --git a/languages/Messages.php b/languages/Messages.php
index 0ee59fc2fa..51cbc6bbe4 100644
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -117,7 +117,7 @@ parent class in order maintain consistency across languages.
 'linkprefix'		=> '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD',
 'mainpage'		=> 'Main Page',
 'mainpagetext'	=> "<big>'''MediaWiki has been successfully installed.'''</big>",
-'mainpagedocfooter' => "Consult the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] for information on using the wiki software.
+'mainpagedocfooter' => "Consult the [http://meta.wikipedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.
 
 == Getting started ==
 
@@ -157,8 +157,7 @@ parent class in order maintain consistency across languages.
 'navigation' => 'Navigation',
 
 # Metadata in edit box
-'metadata' => '<b>Metadata</b> (for an explanation see <a href="$1">here</a>)',
-'metadata_page' => 'Wikipedia:Metadata',
+'metadata_help' => 'Metadata (see [[{{ns:project}}:Metadata]] for an explanation):',
 
 'currentevents' => 'Current events',
 'currentevents-url' => 'Current events',