From 6bf06ffe027c13d958697ff64b58d7e318e706d6 Mon Sep 17 00:00:00 2001
From: "Mr. E23" <e23@users.mediawiki.org>
Date: Sat, 24 Jan 2004 20:58:13 +0000
Subject: [PATCH] compatibility modifications in preparation for the new
 memcached client

---
 includes/LinkCache.php         | 2 +-
 includes/MemcachedSessions.php | 2 +-
 includes/User.php              | 2 +-
 includes/WatchedItem.php       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/LinkCache.php b/includes/LinkCache.php
index 3c685ef997..3052aca230 100644
--- a/includes/LinkCache.php
+++ b/includes/LinkCache.php
@@ -121,7 +121,7 @@ class LinkCache {
 		$id = FALSE;
 		if( $wgLinkCacheMemcached )
 			$id = $wgMemc->get( $key = $this->getKey( $title ) );
-		if( $id === FALSE ) {
+		if( ! $id ) {
 			$sql = "SELECT cur_id FROM cur WHERE cur_namespace=" .
 			  "{$ns} AND cur_title='" . wfStrencode( $t ) . "'";
 			$res = wfQuery( $sql, DB_READ, "LinkCache::addLink" );
diff --git a/includes/MemcachedSessions.php b/includes/MemcachedSessions.php
index 4b72e58f36..db0382d471 100644
--- a/includes/MemcachedSessions.php
+++ b/includes/MemcachedSessions.php
@@ -28,7 +28,7 @@ function memsess_close() {
 function memsess_read( $id ) {
 	global $wgMemc;
 	$data = $wgMemc->get( memsess_key( $id ) );
-	if( $data === FALSE ) return "";
+	if( ! $data ) return "";
 	return $data;
 }
 
diff --git a/includes/User.php b/includes/User.php
index 3d1ca1090d..8aa688d1cd 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -230,7 +230,7 @@ class User {
 			global $wgDBname, $wgMemc;
 			$key = "$wgDBname:newtalk:ip:{$this->mName}";
 			$newtalk = $wgMemc->get( $key );
-			if($newtalk === false) {
+			if( ! is_integer($newtalk) ) {
 				$sql = "SELECT 1 FROM user_newtalk WHERE user_ip='{$this->mName}'";
 				$res = wfQuery ($sql, DB_READ, "User::loadFromDatabase" );
 
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index de5e649d90..b66d249e17 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -25,11 +25,11 @@ class WatchedItem {
 		global $wgMemc;
 		$key = $this->watchKey();
 		$iswatched = $wgMemc->get( $key );
-		if( $iswatched !== false ) return $iswatched;
+		if( is_integer( $iswatched ) ) return $iswatched;
 		
 		$sql = "SELECT 1 FROM watchlist WHERE wl_user=$this->id AND wl_namespace=$this->ns AND wl_title='$this->eti'";
 		$res = wfQuery( $sql, DB_READ );
-		$iswatched = (wfNumRows( $res ) > 0);
+		$iswatched = (wfNumRows( $res ) > 0) ? 1 : 0;
 		$wgMemc->set( $key, $iswatched );
 		return $iswatched;
 	}
-- 
2.20.1