From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 23 Jun 2005 18:25:00 +0000 (+0000)
Subject: * (bug 2493) code cleanup
X-Git-Tag: 1.5.0beta1~77
X-Git-Url: http://git.cyclocoop.org/%27http:/code.google.com/p/ie7-js/%27%40url%40/%7B%24admin_url%7Dmembres/%27.find_in_path%28?a=commitdiff_plain;h=b5571abf267a0a018bec53982a8063c5d9641406;p=lhc%2Fweb%2Fwiklou.git

* (bug 2493) code cleanup
---

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 4dd83db319..90d6eb9198 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -213,7 +213,6 @@ class QueryPage {
 		$querycache = $dbr->tableName( 'querycache' );
 
 		$wgOut->setSyndicated( $this->isSyndicated() );
-		$res = false;
 
 		if ( $this->isExpensive() ) {
 			// Disabled recache parameter due to retry problems -- TS
@@ -222,17 +221,14 @@ class QueryPage {
 				$sql =
 					"SELECT qc_type as type, qc_namespace as namespace,qc_title as title, qc_value as value
 					 FROM $querycache WHERE qc_type='$type'";
-			}
-			if( $wgMiserMode ) {
 				$wgOut->addWikiText( wfMsg( 'perfcached' ) );
 			}
 		}
-		if ( $res === false ) {
-			$res = $dbr->query( $sql . $this->getOrder() .
-					    $dbr->limitResult( $limit,$offset ), $fname );
-			$num = $dbr->numRows($res);
-		}
-
+		
+		$res = $dbr->query( $sql . $this->getOrder() .
+				    $dbr->limitResult( $limit,$offset ), $fname );
+		$num = $dbr->numRows($res);
+		
 		$sk = $wgUser->getSkin( );
 
 		if($shownavigation) {