X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrenameDbPrefix.php;h=e5aa23ec4d693086693adf5dd7dbd521e432a88f;hb=88905b2b73afa52ae3ab8f55ecc1af06c3ec9886;hp=af8a2802d59331e82cf40946ec2d5d542478e1da;hpb=16ef3e79c4c52aa6b74563b7eadcfc9792e7a4c4;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/renameDbPrefix.php b/maintenance/renameDbPrefix.php index af8a2802d5..e5aa23ec4d 100644 --- a/maintenance/renameDbPrefix.php +++ b/maintenance/renameDbPrefix.php @@ -50,7 +50,7 @@ class RenameDbPrefix extends Maintenance { } else { // Use nice safe, sane, prefixes preg_match( '/^[a-zA-Z]+_$/', $this->getOption( 'old' ), $m ); - $old = isset( $m[0] ) ? $m[0] : false; + $old = $m[0] ?? false; } // Allow for no new prefix if ( $this->getOption( 'new', 0 ) === '0' ) { @@ -58,7 +58,7 @@ class RenameDbPrefix extends Maintenance { } else { // Use nice safe, sane, prefixes preg_match( '/^[a-zA-Z]+_$/', $this->getOption( 'new' ), $m ); - $new = isset( $m[0] ) ? $m[0] : false; + $new = $m[0] ?? false; } if ( $old === false || $new === false ) { @@ -82,7 +82,9 @@ class RenameDbPrefix extends Maintenance { // $old should be regexp safe ([a-zA-Z_]) $newTable = preg_replace( '/^' . $old . '/', $new, $table ); $this->output( "Renaming table $table to $newTable\n" ); - $dbw->query( "RENAME TABLE $table TO $newTable" ); + $oldTableEnc = $dbw->addIdentifierQuotes( $table ); + $newTableEnc = $dbw->addIdentifierQuotes( $newTable ); + $dbw->query( "RENAME TABLE $oldTableEnc TO $newTableEnc" ); } $count++; }