Changeset 13387 for trunk/wp-includes/wp-db.php

Timestamp:

02/24/2010 09:30:13 PM (16 years ago)

Author:

wpmuguru

Message:

database code cleanup, See #12362

File:

• trunk/wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-includes/wp-db.php

@@ -549 +549 @@
          * @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 ) )
@@ -561 +561 @@
                 $this->base_prefix = $prefix;
 
-                foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
-                        $this->$table = $prefixed_table;
-
-                if ( defined( 'VHOST' ) && empty( $this->blogid ) )
-                        return $old_prefix;
-
-                $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;
-
+                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;
+
+                        $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;
+                }
                 return $old_prefix;
         }