Merge "(bug 40610) Prevent editing textarea from overflowing out of bodyContent"

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

diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php
index a4261f9..2085da9 100644 (file)
--- a/maintenance/cleanupRemovedModules.php
+++ b/maintenance/cleanupRemovedModules.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * Maintenance script to remove cache entries for removed ResourceLoader modules
- * from the database
+ * Remove cache entries for removed ResourceLoader modules from the database.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +22,14 @@
  * @author Roan Kattouw
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script to remove cache entries for removed ResourceLoader modules
+ * from the database.
+ *
+ * @ingroup Maintenance
+ */
 class CleanupRemovedModules extends Maintenance {
 
        public function __construct() {
@@ -37,7 +42,7 @@ class CleanupRemovedModules extends Maintenance {
        public function execute() {
                $dbw = wfGetDB( DB_MASTER );
                $rl = new ResourceLoader();
-               $moduleNames = array_keys( $rl->getModuleNames() );
+               $moduleNames = $rl->getModuleNames();
                $moduleList = implode( ', ', array_map( array( $dbw, 'addQuotes' ), $moduleNames ) );
                $limit = max( 1, intval( $this->getOption( 'batchsize', 500 ) ) );
                $maxlag = intval( $this->getOption( 'max-slave-lag', 5 ) );
@@ -59,7 +64,7 @@ class CleanupRemovedModules extends Maintenance {
                $this->output( "Cleaning up msg_resource table...\n" );
                $i = 1;
 
-               $mrRes = $dbw->tableName( 'mr_resource' );
+               $mrRes = $dbw->tableName( 'msg_resource' );
                do {
                        $where = $moduleList ? "mr_resource NOT IN ($moduleList)" : '1=1';
                        $dbw->query( "DELETE FROM $mrRes WHERE $where LIMIT $limit", __METHOD__ );
@@ -72,10 +77,10 @@ class CleanupRemovedModules extends Maintenance {
 
                $this->output( "Cleaning up msg_resource_links table...\n" );
                $i = 1;
-               $msgRes = $dbw->tableName( 'mr_resource_links' );
+               $msgResLinks = $dbw->tableName( 'msg_resource_links' );
                do {
                        $where = $moduleList ? "mrl_resource NOT IN ($moduleList)" : '1=1';
-                       $dbw->query( "DELETE FROM $msgRes WHERE $where LIMIT $limit", __METHOD__ );
+                       $dbw->query( "DELETE FROM $msgResLinks WHERE $where LIMIT $limit", __METHOD__ );
                        $numRows = $dbw->affectedRows();
                        $this->output( "Batch $i: $numRows rows\n" );
                        $i++;
@@ -86,4 +91,4 @@ class CleanupRemovedModules extends Maintenance {
 }
 
 $maintClass = "CleanupRemovedModules";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );