* Try reading revision _text_ from master if no result on slave

* Use content-language message cache for raw view of message pages

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b74efaa..79c94d2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -378,6 +378,9 @@ Various bugfixes, small features, and a few experimental things:
 * Convert non-UTF-8 URL parameters even if referer is local
 * (bug 2460) <img> width & height properly filled when resizing image
 * (bug 2273) deletion log comment used user interface langage
+* Try reading revision _text_ from master if no result on slave
+* Use content-language message cache for raw view of message pages
+
 
 === Caveats ===
 

diff --git a/includes/RawPage.php b/includes/RawPage.php
index e3ea7f7..1473922 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -112,7 +112,7 @@ class RawPage {
                if( $this->mTitle ) {
                        # Special case for MediaWiki: messages; we can hit the message cache.
                        if( $this->mTitle->getNamespace() == NS_MEDIAWIKI) {
-                               $rawtext = wfMsg( $this->mTitle->getDbkey() );
+                               $rawtext = wfMsgForContent( $this->mTitle->getDbkey() );
                                return $rawtext;
                        }
                        

diff --git a/includes/Revision.php b/includes/Revision.php
index f3c64f5..7c74bd0 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -548,6 +548,14 @@ class Revision {
                        array( 'old_id' => $this->getTextId() ),
                        $fname);
                
+               if( !$row ) {
+                       $dbw =& wfGetDB( DB_MASTER );
+                       $row = $dbw->selectRow( 'text',
+                               array( 'old_text', 'old_flags' ),
+                               array( 'old_id' => $this->getTextId() ),
+                               $fname);
+               }
+               
                $text = Revision::getRevisionText( $row );
                wfProfileOut( $fname );