A little refactoring of the input splitting/expansion:

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

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 788774f..e4de67c 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -1,12 +1,10 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 /**
  *
- * @package MediaWiki
  */
 class WatchedItem {
        var $mTitle, $mUser;
@@ -16,10 +14,10 @@ class WatchedItem {
         * @todo document
         * @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,31 +29,18 @@ class WatchedItem {
                return $wl;
        }
 
-       /**
-        * 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;
        }
 
@@ -137,25 +116,20 @@ 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";
                $oldnamespace = $ot->getNamespace();
                $newnamespace = $nt->getNamespace();
                $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'
@@ -186,4 +160,4 @@ class WatchedItem {
 
 }
 
-?>
+