* (bug 7681, 11559) Cookie values no longer override GET and POST variables.

[lhc/web/wiklou.git] / maintenance / cleanupDupes.inc

diff --git a/maintenance/cleanupDupes.inc b/maintenance/cleanupDupes.inc
index 18daab0..ce1ffc6 100644 (file)
--- a/maintenance/cleanupDupes.inc
+++ b/maintenance/cleanupDupes.inc
@@ -21,12 +21,11 @@
  * If on the old non-unique indexes, check the cur table for duplicate
  * entries and remove them...
  *
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
  */
 
 function fixDupes( $fixthem = false) {
-       $dbw =& wfGetDB( DB_MASTER );
+       $dbw = wfGetDB( DB_MASTER );
        $cur = $dbw->tableName( 'cur' );
        $old = $dbw->tableName( 'old' );
        $dbw->query( "LOCK TABLES $cur WRITE, $old WRITE" );
@@ -113,19 +112,18 @@ END
 }
 
 function checkDupes( $fixthem = false, $indexonly = false ) {
-       global $wgDBname;
-       $dbw =& wfGetDB( DB_MASTER );
+       $dbw = wfGetDB( DB_MASTER );
        if( $dbw->indexExists( 'cur', 'name_title' ) &&
            $dbw->indexUnique( 'cur', 'name_title' ) ) {
-               echo "$wgDBname: cur table has the current unique index; no duplicate entries.\n";
+               echo wfWikiID().": cur table has the current unique index; no duplicate entries.\n";
        } elseif( $dbw->indexExists( 'cur', 'name_title_dup_prevention' ) ) {
-               echo "$wgDBname: cur table has a temporary name_title_dup_prevention unique index; no duplicate entries.\n";
+               echo wfWikiID().": cur table has a temporary name_title_dup_prevention unique index; no duplicate entries.\n";
        } else {
-               echo "$wgDBname: cur table has the old non-unique index and may have duplicate entries.\n";
+               echo wfWikiID().": cur table has the old non-unique index and may have duplicate entries.\n";
                if( !$indexonly ) {
                        fixDupes( $fixthem );
                }
        }
 }
 
-?>
\ No newline at end of file
+?>