(bug 20836) Preload not working for MediaWiki namespace. Note this only works when...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3a2e05b..ed68a45 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -544,6 +544,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Password fields built with HTMLForm now still have the type="password" attribute
   if $wgHtml5=false.
 * (bug 20860) Entries on Special:Allmessages now have direct "edit" link
+* (bug 20836) Preload now works for MediaWiki namespace
 
 == API changes in 1.16 ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4366a37..3a873cd 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -138,7 +138,7 @@ class EditPage {
                                $wgMessageCache->loadAllMessages( $lang );
                                $text = wfMsgGetKey( $message, false, $lang, false );
                                if( wfEmptyMsg( $message, $text ) )
-                                       $text = '';
+                                       $text = $this->getPreloadedText( $preload );
                        } else {
                                # If requested, preload some text.
                                $text = $this->getPreloadedText( $preload );