WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

database code cleanup, See #12362 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-24 21:30:13 +00:00
parent c9df482e54
commit e50b8fa348
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/ms-settings.php
View File

@ -115,7 +115,7 @@ if ( ! $blog_id ) {
} }
} }
$wpdb->set_prefix( $table_prefix ); // set up blog tables $wpdb->set_prefix( $table_prefix, false ); // set DB table prefix
$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id ); $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
$table_prefix = $wpdb->get_blog_prefix(); $table_prefix = $wpdb->get_blog_prefix();

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

@ -548,7 +548,7 @@ class wpdb {
* @param string $prefix Alphanumeric name for the new prefix. * @param string $prefix Alphanumeric name for the new prefix.
* @return string|WP_Error Old prefix or WP_Error on error * @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 ) ) 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*/); 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; $this->base_prefix = $prefix;
foreach ( $this->tables( 'global' ) as $table => $prefixed_table ) if ( $set_table_names ) {
$this->$table = $prefixed_table; foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
if ( defined( 'VHOST' ) && empty( $this->blogid ) ) if ( defined( 'VHOST' ) && empty( $this->blogid ) )
return $old_prefix; 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 ) foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
$this->$table = $prefixed_table; $this->$table = $prefixed_table;
foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
$this->$table = $prefixed_table;
}
return $old_prefix; return $old_prefix;
} }