X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FRevision.php;h=e2ca4814d7d602cfd482ca85337b961ebda77eb8;hb=d3efb28185e84383ee21f77871f592fbe72f4846;hp=d535028a929fe72821071642653352c30e034300;hpb=67322efbafd9838e1ac54a92a911c3528388e095;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Revision.php b/includes/Revision.php
index d535028a92..e2ca4814d7 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -121,8 +121,6 @@ class Revision implements IDBAccessObject {
 		if ( $id ) {
 			// Use the specified ID
 			$conds['rev_id'] = $id;
-			// This uses slave->master fallback with READ_NORMAL. Assuming revdelete,
-			// moves, and merges are rare, callers can use this to reduce master queries.
 			return self::newFromConds( $conds, $flags );
 		} else {
 			// Use a join to get the latest revision
@@ -150,8 +148,6 @@ class Revision implements IDBAccessObject {
 		$conds = array( 'page_id' => $pageId );
 		if ( $revId ) {
 			$conds['rev_id'] = $revId;
-			// This uses slave->master fallback with READ_NORMAL. Assuming revdelete
-			// and merges are rare, callers can use this to reduce master queries.
 			return self::newFromConds( $conds, $flags );
 		} else {
 			// Use a join to get the latest revision
@@ -310,12 +306,6 @@ class Revision implements IDBAccessObject {
 	private static function newFromConds( $conditions, $flags = 0 ) {
 		$db = wfGetDB( ( $flags & self::READ_LATEST ) ? DB_MASTER : DB_SLAVE );
 		$rev = self::loadFromConds( $db, $conditions, $flags );
-		if ( $rev === null && wfGetLB()->getServerCount() > 1 ) {
-			if ( !( $flags & self::READ_LATEST ) ) {
-				$dbw = wfGetDB( DB_MASTER );
-				$rev = self::loadFromConds( $dbw, $conditions, $flags );
-			}
-		}
 		if ( $rev ) {
 			$rev->mQueryFlags = $flags;
 		}
@@ -1684,23 +1674,21 @@ class Revision implements IDBAccessObject {
 	 *
 	 * @param Title $title
 	 * @param int $id
-	 * @return string
+	 * @return string|bool False if not found
 	 */
-	static function getTimestampFromId( $title, $id ) {
-		$dbr = wfGetDB( DB_SLAVE );
+	static function getTimestampFromId( $title, $id, $flags = 0 ) {
+		$db = ( $flags & self::READ_LATEST )
+			? wfGetDB( DB_MASTER )
+			: wfGetDB( DB_SLAVE );
 		// Casting fix for databases that can't take '' for rev_id
 		if ( $id == '' ) {
 			$id = 0;
 		}
 		$conds = array( 'rev_id' => $id );
 		$conds['rev_page'] = $title->getArticleID();
-		$timestamp = $dbr->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
-		if ( $timestamp === false && wfGetLB()->getServerCount() > 1 ) {
-			# Not in slave, try master
-			$dbw = wfGetDB( DB_MASTER );
-			$timestamp = $dbw->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
-		}
-		return wfTimestamp( TS_MW, $timestamp );
+		$timestamp = $db->selectField( 'revision', 'rev_timestamp', $conds, __METHOD__ );
+
+		return ( $timestamp !== false ) ? wfTimestamp( TS_MW, $timestamp ) : false;
 	}
 
 	/**