Changeset 3668

Timestamp:

03/30/06 23:35:42 (3 years ago)

Author:

ryan

Message:

Move DB prefix dependent code to separate init routines that can be called independently when the prefix changes. These methods are for internal use only.

Files:

• trunk/wp-includes/capabilities.php (modified) (3 diffs)

trunk/wp-includes/capabilities.php

@@ -9 +9 @@
-
-    function WP_Roles() {
+        $this->_init();
+    }
+
+    function _init () {
-        global $wpdb;
-        $this->role_key = $wpdb->prefix . 'user_roles';
@@ -17 +21 @@
-            return;
-
+        $this->role_objects = array();
+        $this->role_names =  array();
-        foreach ($this->roles as $role => $data) {
-            $this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']);
@@ -145 +151 @@
-
-        $this->id = $this->ID;
+        $this->_init_caps();
+    }
+
+    function _init_caps() {
+        global $wpdb;
-        $this->cap_key = $wpdb->prefix . 'capabilities';
-        $this->caps = &$this->{$this->cap_key};