vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-31 02:34:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

database code cleanup, See #12362

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13387 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick
2010-02-24 21:30:13 +00:00
parent b2e6817220
commit fcabf2c9df
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/wp-db.php
View File

@@ -548,7 +548,7 @@ class wpdb {
* @param string $prefix Alphanumeric name for the new prefix.
* @return string|WP_Error Old prefix or WP_Error on error
*/
function set_prefix( $prefix ) {
function set_prefix( $prefix, $set_table_names = true ) {
if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/);
@@ -560,20 +560,21 @@ class wpdb {
$this->base_prefix = $prefix;
foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
if ( $set_table_names ) {
foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
if ( defined( 'VHOST' ) && empty( $this->blogid ) )
return $old_prefix;
if ( defined( 'VHOST' ) && empty( $this->blogid ) )
return $old_prefix;
$this->prefix = $this->get_blog_prefix( $this->blogid );
$this->prefix = $this->get_blog_prefix( $this->blogid );
foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
}
return $old_prefix;
}