From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 27 Jun 2005 03:48:05 +0000 (+0000)
Subject: * Try reading revision _text_ from master if no result on slave
X-Git-Tag: 1.5.0beta2~183
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=45e2cbf7f28791f5a64c807dec708e61058131e7;p=lhc%2Fweb%2Fwiklou.git

* 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 b74efaa2fa..79c94d2693 100644
--- 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 e3ea7f74c5..147392293d 100644
--- 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 f3c64f550c..7c74bd0cc1 100644
--- 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 );