The war on redundant ampersand usage!

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

diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 06451bc..b0376e3 100644 (file)
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -37,7 +37,7 @@ class WatchedItem {
                # remember that talk namespaces are numbered as page namespace+1.
                $fname = 'WatchedItem::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;
@@ -53,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,
@@ -80,7 +80,7 @@ class WatchedItem {
                $fname = 'WatchedItem::removeWatch';
 
                $success = false;
-               $dbw =& wfGetDB( DB_MASTER );
+               $dbw = wfGetDB( DB_MASTER );
                $dbw->delete( 'watchlist',
                        array(
                                'wl_user' => $this->id,
@@ -134,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'