Changeset 6300

Timestamp:

10/31/2007 03:59:18 AM (17 years ago)

Author:

ryan

Message:

wpdb::set_prefix(). fixes #5287

File:

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

trunk/wp-includes/wp-db.php

@@ -21 +21 @@
     var $col_info;
     var $queries;
+    var $prefix = '';
 
     // Our tables
@@ -30 +31 @@
     var $links;
     var $options;
-    var $optiontypes;
-    var $optionvalues;
-    var $optiongroups;
-    var $optiongroup_options;
     var $postmeta;
     var $usermeta;
@@ -39 +36 @@
     var $term_taxonomy;
     var $term_relationships;
-
+    var $tables = array('users', 'usermeta', 'posts', 'categories', 'post2cat', 'comments', 'links', 'link2cat', 'options',
+            'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
     var $charset;
     var $collate;
@@ -85 +83 @@
     function __destruct() {
         return true;
+    }
+
+    function set_prefix($prefix) {
+
+        if ( preg_match('|[^a-z0-9_]|i', $prefix) )
+            return new WP_Error('invalid_db_prefix', 'Invalid database prefix'); // No gettext here
+
+        $old_prefix = $this->prefix;
+        $this->prefix = $prefix;
+
+        foreach ( $this->tables as $table )
+            $this->$table = $this->prefix . $table;
+
+        if ( defined('CUSTOM_USER_TABLE') )
+            $this->users = CUSTOM_USER_TABLE;
+
+        if ( defined('CUSTOM_USER_META_TABLE') )
+            $this->usermeta = CUSTOM_USER_META_TABLE;
+
+        return $old_prefix;
     }