* Simple rate limiter for edits and page moves; set $wgRateLimits

[lhc/web/wiklou.git] / includes / WatchedItem.php

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 3793762..b27c53f 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -65,6 +65,7 @@ class WatchedItem {
         */
        function addWatch() {
                $fname = 'WatchedItem::addWatch';
+               wfProfileIn( $fname );
                # REPLACE instead of INSERT because occasionally someone
                # accidentally reloads a watch-add operation.
                $dbw =& wfGetDB( DB_MASTER );
@@ -89,12 +90,15 @@ class WatchedItem {
 
                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->delete( 'watchlist', 
                        array( 
@@ -103,6 +107,9 @@ class WatchedItem {
                                'wl_title' => $this->ti
                        ), $fname
                );
+               if ( $dbw->affectedRows() ) {
+                       $success = true;
+               }
 
                # the following code compensates the new behaviour, introduced by the
                # enotif patch, that every single watched page needs now to be listed
@@ -117,12 +124,12 @@ class WatchedItem {
                );
                
                if ( $dbw->affectedRows() ) {
-                       global $wgMemc;
+                       $success = true;
+               }
+               if ( $success ) {
                        $wgMemc->set( $this->watchkey(), 0 );
-                       return true;
-               } else {
-                       return false;
                }
+               return $success;
        }
 
        /**