From: Domas Mituzas <midom@users.mediawiki.org>
Date: Wed, 25 Jan 2006 20:50:39 +0000 (+0000)
Subject: do not trust equality propagation, help optimizer a bit ;-)
X-Git-Tag: 1.6.0~425
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=cede31f8926cf870a6bf0fa019c8433722caacad;p=lhc%2Fweb%2Fwiklou.git

do not trust equality propagation, help optimizer a bit ;-)
---

diff --git a/includes/Revision.php b/includes/Revision.php
index 0398a9baf4..7908d56436 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -63,17 +63,13 @@ class Revision {
 	 * @access public
 	 */
 	function loadFromPageId( &$db, $pageid, $id = 0 ) {
+		$conds=array('page_id=rev_page','rev_page'=>intval( $pageid ), 'page_id'=>intval( $pageid ));
 		if( $id ) {
-			$matchId = intval( $id );
+			$conds['rev_id']=intval($id);
 		} else {
-			$matchId = 'page_latest';
+			$conds[]='rev_id=page_latest';
 		}
-		$ret = Revision::loadFromConds(
-			$db,
-			array( "rev_id=$matchId",
-			       'rev_page' => intval( $pageid ),
-			       'page_id=rev_page' ) );
-		return $ret;
+		return Revision::loadFromConds( $db, $conds );
 	}
 
 	/**