* (bug 13431) Show true message source in Special:Allmessages&ot=php / xml

* Use Xml::* functions instead of wf* ones
* Call wfDeprecated() in MessageCache::disableTransform(), MessageCache::enableTransform(), MessageCache::setTransform() and MessageCache::getTransform()

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a6046e8..31d14b6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -150,6 +150,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13556) Don't show a blank form if no image is attached in Special:Upload
 * (bug 13576) maintenance/rebuildrecentchanges.php fails
 * (bug 13441) Allow Special:Recentchanges to show bots only
+* (bug 13431) Show true message source in Special:Allmessages&ot=php / xml
 
 === API changes in 1.13 ===
 

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 99fc2f5..373d174 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -591,10 +591,19 @@ class MessageCache {
        function enable() { $this->mDisable = false; }
 
        /** @deprecated */
-       function disableTransform() {}
-       function enableTransform() {}
-       function setTransform( $x ) {}
-       function getTransform() { return false; }
+       function disableTransform(){
+               wfDeprecated( __METHOD__ );
+       }
+       function enableTransform() {
+               wfDeprecated( __METHOD__ );
+       }
+       function setTransform( $x ) {
+               wfDeprecated( __METHOD__ );
+       }
+       function getTransform() {
+               wfDeprecated( __METHOD__ );
+               return false;
+       }
 
        /**
         * Add a message to the cache

diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index ee97b48..f4c9d0b 100644 (file)
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -31,15 +31,13 @@ function wfSpecialAllmessages() {
        $sortedArray = array_merge( Language::getMessagesFor( 'en' ), $wgMessageCache->getExtensionMessagesFor( 'en' ) );
        ksort( $sortedArray );
        $messages = array();
-       $wgMessageCache->disableTransform();
 
        foreach ( $sortedArray as $key => $value ) {
                $messages[$key]['enmsg'] = $value;
-               $messages[$key]['statmsg'] = wfMsgNoDb( $key );
-               $messages[$key]['msg'] = wfMsg ( $key );
+               $messages[$key]['statmsg'] = wfMsgReal( $key, array(), false, false, false ); // wfMsgNoDbNoTrans doesn't exist
+               $messages[$key]['msg'] = wfMsgNoTrans( $key );
        }
 
-       $wgMessageCache->enableTransform();
        wfProfileOut( __METHOD__ . '-setup' );
 
        wfProfileIn( __METHOD__ . '-output' );
@@ -111,12 +109,12 @@ function wfAllMessagesMakeHTMLText( $messages ) {
        $sk = $wgUser->getSkin();
        $talk = wfMsg( 'talkpagelinktext' );
 
-       $input = wfElement( 'input', array(
+       $input = Xml::element( 'input', array(
                'type'    => 'text',
                'id'      => 'allmessagesinput',
                'onkeyup' => 'allmessagesfilter()'
        ), '' );
-       $checkbox = wfElement( 'input', array(
+       $checkbox = Xml::element( 'input', array(
                'type'    => 'button',
                'value'   => wfMsgHtml( 'allmessagesmodified' ),
                'id'      => 'allmessagescheckbox',