update to MediaWiki 1.17.0

1 files changed, 18 insertions, 16 deletions

diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php
index f73db508..289e747f 100644
--- a/maintenance/renameDbPrefix.php
+++ b/maintenance/renameDbPrefix.php
@@ -20,8 +20,8 @@
  *
  * @ingroup Maintenance
  */
- 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class RenameDbPrefix extends Maintenance {
 	public function __construct() {
@@ -35,43 +35,45 @@ class RenameDbPrefix extends Maintenance {
 	}
 
 	public function execute() {
+		global $wgDBname;
+
 		// Allow for no old prefix
-		if( $this->getOption( 'old', 0 ) === '0' ) {
+		if ( $this->getOption( 'old', 0 ) === '0' ) {
 			$old = '';
 		} else {
 			// Use nice safe, sane, prefixes
-			preg_match( '/^[a-zA-Z]+_$/', $this->getOption('old'), $m );
+			preg_match( '/^[a-zA-Z]+_$/', $this->getOption( 'old' ), $m );
 			$old = isset( $m[0] ) ? $m[0] : false;
 		}
 		// Allow for no new prefix
-		if( $this->getOption( 'new', 0 ) === '0' ) {
+		if ( $this->getOption( 'new', 0 ) === '0' ) {
 			$new = '';
 		} else {
 			// Use nice safe, sane, prefixes
-			preg_match( '/^[a-zA-Z]+_$/', $this->getOption('new'), $m );
+			preg_match( '/^[a-zA-Z]+_$/', $this->getOption( 'new' ), $m );
 			$new = isset( $m[0] ) ? $m[0] : false;
 		}
-	
-		if( $old === false || $new === false ) {
+
+		if ( $old === false || $new === false ) {
 			$this->error( "Invalid prefix!", true );
 		}
-		if( $old === $new ) {
+		if ( $old === $new ) {
 			$this->output( "Same prefix. Nothing to rename!\n", true );
 		}
-	
+
 		$this->output( "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 )."%'" );
-		foreach( $res as $row ) {
+		$res = $dbw->query( "SHOW TABLES " . $dbw->buildLike( $old, $dbw->anyString() ) );
+		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...
 			$fields = get_object_vars( $row );
 			// Silly for loop over one field...
-			foreach( $fields as $resName => $table ) {
+			foreach ( $fields as $table ) {
 				// $old should be regexp safe ([a-zA-Z_])
-				$newTable = preg_replace( '/^'.$old.'/', $new, $table );
+				$newTable = preg_replace( '/^' . $old . '/', $new, $table );
 				$this->output( "Renaming table $table to $newTable\n" );
 				$dbw->query( "RENAME TABLE $table TO $newTable" );
 			}
@@ -82,4 +84,4 @@ class RenameDbPrefix extends Maintenance {
 }
 
 $maintClass = "RenameDbPrefix";
-require_once( DO_MAINTENANCE );
\ No newline at end of file
+require_once( RUN_MAINTENANCE_IF_MAIN );