From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 26 Jun 2005 18:47:09 +0000 (+0000)
Subject: Revision::newFromConds -- grab from master if no result on slave
X-Git-Tag: 1.5.0beta2~200
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=81f8c0e8eec88b3088c819471e887315c0664382;p=lhc%2Fweb%2Fwiklou.git

Revision::newFromConds -- grab from master if no result on slave
---

diff --git a/includes/Revision.php b/includes/Revision.php
index cfe29f66d4..f3c64f550c 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -106,7 +106,12 @@ class Revision {
 	 */
 	function &newFromConds( $conditions ) {
 		$db =& wfGetDB( DB_SLAVE );
-		return Revision::loadFromConds( $db, $conditions );
+		$row = Revision::loadFromConds( $db, $conditions );
+		if( is_null( $row ) ) {
+			$dbw =& wfGetDB( DB_MASTER );
+			$row = Revision::loadFromConds( $dbw, $conditions );
+		}
+		return $row;
 	}
 	
 	/**