1 files changed, 4 insertions, 25 deletions

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 788774fb..b0376e3d 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -1,12 +1,10 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 /**
  *
- * @package MediaWiki
  */
 class WatchedItem {
 	var $mTitle, $mUser;
@@ -32,30 +30,17 @@ class WatchedItem {
 	}
 
 	/**
-	 * Returns the memcached key for this item
-	 */
-	function watchKey() {
-		return wfMemcKey( 'watchlist', 'user', $this->id, 'page', $this->ns, $this->ti );
-	}
-
-	/**
 	 * Is mTitle being watched by mUser?
 	 */
 	function isWatched() {
 		# Pages and their talk pages are considered equivalent for watching;
 		# remember that talk namespaces are numbered as page namespace+1.
-		global $wgMemc;
 		$fname = 'WatchedItem::isWatched';
 
-		$key = $this->watchKey();
-		$iswatched = $wgMemc->get( $key );
-		if( is_integer( $iswatched ) ) return $iswatched;
-
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( 'watchlist', 1, array( 'wl_user' => $this->id, 'wl_namespace' => $this->ns,
 			'wl_title' => $this->ti ), $fname );
 		$iswatched = ($dbr->numRows( $res ) > 0) ? 1 : 0;
-		$wgMemc->set( $key, $iswatched );
 		return $iswatched;
 	}
 
@@ -68,7 +53,7 @@ class WatchedItem {
 
 		// Use INSERT IGNORE to avoid overwriting the notification timestamp
 		// if there's already an entry for this page
-		$dbw =& wfGetDB( DB_MASTER );
+		$dbw = wfGetDB( DB_MASTER );
 		$dbw->insert( 'watchlist',
 		  array(
 		    'wl_user' => $this->id,
@@ -87,18 +72,15 @@ class WatchedItem {
 			'wl_notificationtimestamp' => NULL
 		  ), $fname, 'IGNORE' );
 
-		global $wgMemc;
-		$wgMemc->set( $this->watchkey(), 1 );
 		wfProfileOut( $fname );
 		return true;
 	}
 
 	function removeWatch() {
-		global $wgMemc;
 		$fname = 'WatchedItem::removeWatch';
 
 		$success = false;
-		$dbw =& wfGetDB( DB_MASTER );
+		$dbw = wfGetDB( DB_MASTER );
 		$dbw->delete( 'watchlist',
 			array(
 				'wl_user' => $this->id,
@@ -125,9 +107,6 @@ class WatchedItem {
 		if ( $dbw->affectedRows() ) {
 			$success = true;
 		}
-		if ( $success ) {
-			$wgMemc->set( $this->watchkey(), 0 );
-		}
 		return $success;
 	}
 
@@ -155,7 +134,7 @@ class WatchedItem {
 		$oldtitle = $ot->getDBkey();
 		$newtitle = $nt->getDBkey();
 
-		$dbw =& wfGetDB( DB_MASTER );
+		$dbw = wfGetDB( DB_MASTER );
 		$res = $dbw->select( 'watchlist', 'wl_user',
 			array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ),
 			$fname, 'FOR UPDATE'