Changeset 10201

Timestamp:

12/12/2008 08:48:08 PM (18 years ago)

Author:

ryan

Message:

Explicitly return ref for the sake of PHP4. Fixes user_level being empty when installing on PHP4. Props Mr Pete. fixes #8317 for 2.7

Location:

branches/2.7

Files:

• wp-admin/includes/schema.php (modified) (13 diffs)
• wp-includes/capabilities.php (modified) (1 diff)

branches/2.7/wp-admin/includes/schema.php

@@ -352 +352 @@
 
         // Add caps for Administrator role
-        $role = get_role('administrator');
+        $role =& get_role('administrator');
         $role->add_cap('switch_themes');
         $role->add_cap('edit_themes');
@@ -385 +385 @@
 
         // Add caps for Editor role
-        $role = get_role('editor');
+        $role =& get_role('editor');
         $role->add_cap('moderate_comments');
         $role->add_cap('manage_categories');
@@ -407 +407 @@
 
         // Add caps for Author role
-        $role = get_role('author');
+        $role =& get_role('author');
         $role->add_cap('upload_files');
         $role->add_cap('edit_posts');
@@ -418 +418 @@
 
         // Add caps for Contributor role
-        $role = get_role('contributor');
+        $role =& get_role('contributor');
         $role->add_cap('edit_posts');
         $role->add_cap('read');
@@ -425 +425 @@
 
         // Add caps for Subscriber role
-        $role = get_role('subscriber');
+        $role =& get_role('subscriber');
         $role->add_cap('read');
         $role->add_cap('level_0');
@@ -438 +438 @@
         $roles = array('administrator', 'editor');
         foreach ($roles as $role) {
-                $role = get_role($role);
+                $role =& get_role($role);
                 if ( empty($role) )
                         continue;
@@ -459 +459 @@
         }
 
-        $role = get_role('administrator');
+        $role =& get_role('administrator');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_users');
@@ -465 +465 @@
         }
 
-        $role = get_role('author');
+        $role =& get_role('author');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_posts');
@@ -471 +471 @@
         }
 
-        $role = get_role('contributor');
+        $role =& get_role('contributor');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_posts');
@@ -483 +483 @@
  */
 function populate_roles_230() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
@@ -496 +496 @@
  */
 function populate_roles_250() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
@@ -509 +509 @@
  */
 function populate_roles_260() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
@@ -523 +523 @@
  */
 function populate_roles_270() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {

branches/2.7/wp-includes/capabilities.php

@@ -534 +534 @@
                 $this->allcaps = array();
                 foreach ( (array) $this->roles as $role ) {
-                        $role = $wp_roles->get_role( $role );
+                        $role =& $wp_roles->get_role( $role );
                         $this->allcaps = array_merge( $this->allcaps, $role->capabilities );
                 }