renameDbPrefix.php tweaks: corrected script name in help message (this is not updateS...

diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php
index 17568b4..277f3b9 100644 (file)
--- a/maintenance/renameDbPrefix.php
+++ b/maintenance/renameDbPrefix.php
@@ -1,17 +1,17 @@
 <?php
 /**
- * Run this script to after changing $wgDBPrefix on a wiki.
+ * Run this script to after changing $wgDBprefix on a wiki.
  * The wiki will have to get downtime to do this correctly.
  *
  * @file
  * @ingroup Maintenance
  */
-$optionsWithArgs = array('old','new','help');
+$optionsWithArgs = array( 'old', 'new', 'help' );
 
 require_once( 'commandLine.inc' );
 
-if( @$options['help'] || !isset($options['old']) || !isset($options['new']) ) {
-       print "usage:updateSpecialPages.php [--help] [--old x] [new y]\n";
+if( @$options['help'] || !isset( $options['old'] ) || !isset( $options['new'] ) ) {
+       print "usage: renameDbPrefix.php [--help] [--old x] [new y]\n";
        print "  --help      : this help message\n";
        print "  --old x       : old db prefix x\n";
        print "  --old 0       : EMPTY old db prefix x\n";
@@ -26,7 +26,7 @@ if( $options['old'] === '0' ) {
 } else {
        // Use nice safe, sane, prefixes
        preg_match( '/^[a-zA-Z]+_$/', $options['old'], $m );
-       $old = isset($m[0]) ? $m[0] : false;
+       $old = isset( $m[0] ) ? $m[0] : false;
 }
 // Allow for no new prefix
 if( $options['new'] === '0' ) {
@@ -34,10 +34,10 @@ if( $options['new'] === '0' ) {
 } else {
        // Use nice safe, sane, prefixes
        preg_match( '/^[a-zA-Z]+_$/', $options['new'], $m );
-       $new = isset($m[0]) ? $m[0] : false;
+       $new = isset( $m[0] ) ? $m[0] : false;
 }
 
-if( $old===false || $new===false ) {
+if( $old === false || $new === false ) {
        print "Invalid prefix!\n";
        wfDie();
 }
@@ -50,7 +50,7 @@ print "Renaming DB prefix for tables of $wgDBname from '$old' to '$new'\n";
 $count = 0;
 
 $dbw = wfGetDB( DB_MASTER );
-$res = $dbw->query( "SHOW TABLES LIKE '".$dbw->escapeLike($old)."%'" );
+$res = $dbw->query( "SHOW TABLES LIKE '".$dbw->escapeLike( $old )."%'" );
 foreach( $res as $row ) {
        // XXX: odd syntax. MySQL outputs an oddly cased "Tables of X"
        // sort of message. Best not to try $row->x stuff...
@@ -58,11 +58,10 @@ foreach( $res as $row ) {
        // Silly for loop over one field...
        foreach( $fields as $resName => $table ) {
                // $old should be regexp safe ([a-zA-Z_])
-               $newTable = preg_replace( '/^'.$old.'/',$new,$table);
+               $newTable = preg_replace( '/^'.$old.'/', $new, $table );
                print "Renaming table $table to $newTable\n";
                $dbw->query( "RENAME TABLE $table TO $newTable" );
        }
        $count++;
 }
-print "Done! [$count tables]\n";
-
+print "Done! [$count tables]\n";
\ No newline at end of file