MediaWiki 1.11.0

[autoinstalls/mediawiki.git] / includes / WatchedItem.php

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 1912f5400b6c0f2b64f428dd0a48a8ec2932c9fe..e4de67c837b59afca675ef521e40bfcdbdd017b5 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -1,12 +1,10 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 /**
  *
- * @package MediaWiki
  */
 class WatchedItem {
        var $mTitle, $mUser;
@@ -14,12 +12,12 @@ class WatchedItem {
        /**
         * Create a WatchedItem object with the given user and title
         * @todo document
-        * @private
+        * @access private
         */
-       function &fromUserTitle( &$user, &$title ) {
+       static function fromUserTitle( $user, $title ) {
                $wl = new WatchedItem;
-               $wl->mUser =& $user;
-               $wl->mTitle =& $title;
+               $wl->mUser = $user;
+               $wl->mTitle = $title;
                $wl->id = $user->getId();
 # Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004
 # TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
@@ -31,32 +29,18 @@ class WatchedItem {
                return $wl;
        }
 
-       /**
-        * Returns the memcached key for this item
-        */
-       function watchKey() {
-               global $wgDBname;
-               return "$wgDBname: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 );
-               $res = $dbr->select( 'watchlist', 1, array( 'wl_user' => $this->id, 'wl_namespace' => $this->ns, 
+               $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;
        }
 
@@ -66,43 +50,40 @@ 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 );
-               $dbw->replace( 'watchlist', array(array('wl_user', 'wl_namespace', 'wl_title', 'wl_notificationtimestamp')),
-                 array( 
+
+               // Use INSERT IGNORE to avoid overwriting the notification timestamp
+               // if there's already an entry for this page
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->insert( 'watchlist',
+                 array(
                    'wl_user' => $this->id,
                        'wl_namespace' => ($this->ns & ~1),
                        'wl_title' => $this->ti,
-                       'wl_notificationtimestamp' => '0'
-                 ), $fname );
+                       'wl_notificationtimestamp' => NULL
+                 ), $fname, 'IGNORE' );
 
-               # the following code compensates the new behaviour, introduced by the enotif patch,
-               # that every single watched page needs now to be listed in watchlist
-               # namespace:page and namespace_talk:page need separate entries: create them
-               $dbw->replace( 'watchlist', array(array('wl_user', 'wl_namespace', 'wl_title', 'wl_notificationtimestamp')),
+               // Every single watched page needs now to be listed in watchlist;
+               // namespace:page and namespace_talk:page need separate entries:
+               $dbw->insert( 'watchlist',
                  array(
                        'wl_user' => $this->id,
                        'wl_namespace' => ($this->ns | 1 ),
                        'wl_title' => $this->ti,
-                       'wl_notificationtimestamp' => '0'
-                 ), $fname );
+                       '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->delete( 'watchlist', 
-                       array( 
-                               'wl_user' => $this->id, 
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->delete( 'watchlist',
+                       array(
+                               'wl_user' => $this->id,
                                'wl_namespace' => ($this->ns & ~1),
                                'wl_title' => $this->ti
                        ), $fname
@@ -122,13 +103,10 @@ class WatchedItem {
                                'wl_title' => $this->ti
                        ), $fname
                );
-               
+
                if ( $dbw->affectedRows() ) {
                        $success = true;
                }
-               if ( $success ) {
-                       $wgMemc->set( $this->watchkey(), 0 );
-               }
                return $success;
        }
 
@@ -138,29 +116,21 @@ class WatchedItem {
         *
         * @param Title $ot Page title to duplicate entries from, if present
         * @param Title $nt Page title to add watches on
-        * @static
         */
-       function duplicateEntries( $ot, $nt ) {
+       static function duplicateEntries( $ot, $nt ) {
                WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() );
                WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() );
        }
-       
-       /**
-        * @static
-        * @access private
-        */
-       function doDuplicateEntries( $ot, $nt ) {
+
+       private static function doDuplicateEntries( $ot, $nt ) {
                $fname = "WatchedItem::duplicateEntries";
-               global $wgMemc, $wgDBname;
                $oldnamespace = $ot->getNamespace();
                $newnamespace = $nt->getNamespace();
                $oldtitle = $ot->getDBkey();
                $newtitle = $nt->getDBkey();
 
-               $dbw =& wfGetDB( DB_MASTER );
-               $watchlist = $dbw->tableName( 'watchlist' );
-               
-               $res = $dbw->select( 'watchlist', 'wl_user', 
+               $dbw = wfGetDB( DB_MASTER );
+               $res = $dbw->select( 'watchlist', 'wl_user',
                        array( 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ),
                        $fname, 'FOR UPDATE'
                );
@@ -174,7 +144,7 @@ class WatchedItem {
                        );
                }
                $dbw->freeResult( $res );
-               
+
                if( empty( $values ) ) {
                        // Nothing to do
                        return true;
@@ -190,4 +160,4 @@ class WatchedItem {
 
 }
 
-?>
+