From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 23 Apr 2011 14:24:42 +0000 (+0000)
Subject: Followup r86763, and also fix ancient revision from SpecialProtectedpages (Aaron... 
X-Git-Tag: 1.31.0-rc.0~30606
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=c28ffe91c1d368fa46775c8b8776b8d906e14571;p=lhc%2Fweb%2Fwiklou.git

Followup r86763, and also fix ancient revision from SpecialProtectedpages (Aaron at fault), use $db->getInfinity()
---

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 71367789c9..eeb4b83be5 100644
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -138,9 +138,9 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 			$forceNameTitleIndex = false;
 
 			if ( $params['prexpiry'] == 'indefinite' ) {
-				$this->addWhere( "pr_expiry = 'infinity' OR pr_expiry IS NULL" );
+				$this->addWhere( "pr_expiry = {$db->addQuotes( $db->getInfinity() )} OR pr_expiry IS NULL" );
 			} elseif ( $params['prexpiry'] == 'definite' ) {
-				$this->addWhere( "pr_expiry != 'infinity'" );
+				$this->addWhere( "pr_expiry != {$db->addQuotes( $db->getInfinity() )}" );
 			}
 
 		} elseif ( isset( $params['prlevel'] ) ) {
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index 5039dfdd69..a67b7e2716 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -337,7 +337,8 @@ class ProtectedPagesPager extends AlphabeticPager {
 		}
 
 		if( $this->indefonly ) {
-			$conds[] = "pr_expiry = 'infinity' OR pr_expiry IS NULL";
+			$db = wfGetDB( DB_SLAVE );
+			$conds[] = "pr_expiry = {$db->addQuotes( $db->getInfinity() )} OR pr_expiry IS NULL";
 		}
 		if( $this->cascadeonly ) {
 			$conds[] = "pr_cascade = '1'";