Whitespace fixes for r75486

diff --git a/maintenance/cleanupRemovedModules.php b/maintenance/cleanupRemovedModules.php
new file mode 100644 (file)
index 0000000..9f22adf
--- /dev/null
+++ b/maintenance/cleanupRemovedModules.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Maintenance script to create an account and grant it administrator rights
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ * @author Rob Church <robchur@gmail.com>
+ */
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+
+class CleanupRemovedModules extends Maintenance {
+
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = 'Remove cache entries for removed ResourceLoader modules from the database';
+               $this->addOption( 'batchsize', 'Delete rows in batches of this size. Default: 500', false, true );
+               $this->addOption( 'max-slave-lag', 'If the slave lag exceeds this many seconds, wait until it drops below this value. Default: 5', false, true );
+       }
+
+       public function execute() {
+               $dbw = wfGetDB( DB_MASTER );
+               $rl = new ResourceLoader();
+               $moduleNames = array_keys( $rl->getModules() );
+               $moduleList = implode( ', ', array_map( array( $dbw, 'addQuotes' ), $moduleNames ) );
+               $limit = min( 1, intval( $this->getOption( 'batchsize', 500 ) ) );
+               $maxlag = intval( $this->getOption( 'max-slave-lag', 5 ) );
+               
+               $this->output( "Cleaning up module_deps table...\n" );
+               $i = 1;
+               do {
+                       // $dbw->delete() doesn't support LIMIT :(
+                       $dbw->query( "DELETE FROM module_deps WHERE md_module NOT IN ($moduleList) LIMIT $limit", __METHOD__ );
+                       $numRows = $dbw->affectedRows();
+                       $this->output( "Batch $i: $numRows rows\n" );
+                       $i++;
+                       wfWaitForSlaves( $maxlag );
+               } while( $dbw->affectedRows() > 0 );
+               $this->output( "done\n" );
+               
+               $this->output( "Cleaning up msg_resource table...\n" );
+               $i = 1;
+               do {
+                       // $dbw->delete() doesn't support LIMIT :(
+                       $dbw->query( "DELETE FROM msg_resource WHERE mr_resource NOT IN ($moduleList) LIMIT $limit", __METHOD__ );
+                       $numRows = $dbw->affectedRows();
+                       $this->output( "Batch $i: $numRows rows\n" );
+                       $i++;
+                       wfWaitForSlaves( $maxlag );
+               } while( $dbw->affectedRows() > 0 );
+               $this->output( "done\n" );
+               
+               $this->output( "Cleaning up msg_resource_links table...\n" );
+               $i = 1;
+               do {
+                       // $dbw->delete() doesn't support LIMIT :(
+                       $dbw->query( "DELETE FROM msg_resource_links WHERE mrl_resource NOT IN ($moduleList) LIMIT $limit", __METHOD__ );
+                       $numRows = $dbw->affectedRows();
+                       $this->output( "Batch $i: $numRows rows\n" );
+                       $i++;
+                       wfWaitForSlaves( $maxlag );
+               } while( $dbw->affectedRows() > 0 );
+               $this->output( "done\n" );
+       }
+}
+
+$maintClass = "CleanupRemovedModules";
+require_once( DO_MAINTENANCE );
\ No newline at end of file

diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 0c89509..e2ec855 100644 (file)
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -18,9 +18,9 @@ mediaWiki.language = {
         * @example {{Template:title|params}}
         */
        'procPLURAL': function( template ) {
-               if( template.title && template.parameters && mediaWiki.language.convertPlural) {
+               if ( template.title && template.parameters && mediaWiki.language.convertPlural ) {
                        // Check if we have forms to replace
-                       if ( template.parameters.length == 0 ) { 
+                       if ( template.parameters.length == 0 ) {
                                return '';
                        }
                        // Restore the count into a Number ( if it got converted earlier )
@@ -29,7 +29,7 @@ mediaWiki.language = {
                        return mediaWiki.language.convertPlural( parseInt( count ), template.parameters );
                }
                // Could not process plural return first form or nothing
-               if( template.parameters[0] ) {
+               if ( template.parameters[0] ) {
                        return template.parameters[0];
                }
                return '';
@@ -41,10 +41,10 @@ mediaWiki.language = {
         * @param {array} forms List of plural forms
         * @return {string} Correct form for quantifier in this language
         */
-       'convertPlural': function( count, forms ){      
-               if ( !forms || forms.length == 0 ) { 
+       'convertPlural': function( count, forms ){
+               if ( !forms || forms.length == 0 ) {
                        return ''; 
-               }       
+               }
                return ( parseInt( count ) == 1 ) ? forms[0] : forms[1];
        },
        /**
@@ -72,9 +72,9 @@ mediaWiki.language = {
                }
                // Set the target Transform table: 
                var transformTable = mediaWiki.language.digitTransformTable;
-               // Check if the "restore" to Latin number flag is set: 
-               if ( integer ) {                        
-                       if ( parseInt( number ) == number )     {
+               // Check if the "restore" to Latin number flag is set:
+               if ( integer ) {
+                       if ( parseInt( number ) == number ) {
                                return number;
                        }
                        var tmp = [];
@@ -92,7 +92,7 @@ mediaWiki.language = {
                                convertedNumber += numberString[i];
                        }
                }
-               return integer ? parseInt( convertedNumber) : convertedNumber;
+               return integer ? parseInt( convertedNumber ) : convertedNumber;
        },
        // Digit Transform Table, populated by language classes where applicable
        'digitTransformTable': null

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index dcb8c79..78c2788 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -249,7 +249,7 @@ window.mediaWiki = new ( function( $ ) {
        this.message = function( key, parameters ) {
                // Support variadic arguments
                if ( typeof parameters !== 'undefined' ) {
-                       parameters = $.makeArray( arguments);
+                       parameters = $.makeArray( arguments );
                        parameters.shift();
                } else {
                        parameters = [];