Make user_ip in user_newtalk a TEXT, as it is not an IP field.

[lhc/web/wiklou.git] / maintenance / userDupes.php

diff --git a/maintenance/userDupes.php b/maintenance/userDupes.php
index 34eb13a..90de160 100644 (file)
--- a/maintenance/userDupes.php
+++ b/maintenance/userDupes.php
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 $options = array( 'fix' );
@@ -26,7 +26,7 @@ require_once( 'maintenance/userDupes.inc' );
 $wgTitle = Title::newFromText( 'Dupe user entry cleanup script' );
 
 $fix = isset( $options['fix'] );
-$dbw =& wfGetDB( DB_MASTER );
+$dbw = wfGetDB( DB_MASTER );
 $duper = new UserDupes( $dbw );
 $retval = $duper->checkDupes( $fix );