Ticket #8317: rolefix.diff

wp-admin/includes/schema.php

@@ -351 +351 @@
         add_role('subscriber', 'Subscriber|User role');
 
         // Add caps for Administrator role
-        $role = get_role('administrator');
+        $role =& get_role('administrator');
         $role->add_cap('switch_themes');
         $role->add_cap('edit_themes');
         $role->add_cap('activate_plugins');
@@ -384 +384 @@
         $role->add_cap('level_0');
 
         // Add caps for Editor role
-        $role = get_role('editor');
+        $role =& get_role('editor');
         $role->add_cap('moderate_comments');
         $role->add_cap('manage_categories');
         $role->add_cap('manage_links');
@@ -406 +406 @@
         $role->add_cap('level_0');
 
         // Add caps for Author role
-        $role = get_role('author');
+        $role =& get_role('author');
         $role->add_cap('upload_files');
         $role->add_cap('edit_posts');
         $role->add_cap('edit_published_posts');
@@ -417 +417 @@
         $role->add_cap('level_0');
 
         // Add caps for Contributor role
-        $role = get_role('contributor');
+        $role =& get_role('contributor');
         $role->add_cap('edit_posts');
         $role->add_cap('read');
         $role->add_cap('level_1');
         $role->add_cap('level_0');
 
         // Add caps for Subscriber role
-        $role = get_role('subscriber');
+        $role =& get_role('subscriber');
         $role->add_cap('read');
         $role->add_cap('level_0');
 }
@@ -437 +437 @@
 function populate_roles_210() {
         $roles = array('administrator', 'editor');
         foreach ($roles as $role) {
-                $role = get_role($role);
+                $role =& get_role($role);
                 if ( empty($role) )
                         continue;
 
@@ -458 +458 @@
                 $role->add_cap('read_private_pages');
         }
 
-        $role = get_role('administrator');
+        $role =& get_role('administrator');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_users');
                 $role->add_cap('create_users');
         }
 
-        $role = get_role('author');
+        $role =& get_role('author');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_posts');
                 $role->add_cap('delete_published_posts');
         }
 
-        $role = get_role('contributor');
+        $role =& get_role('contributor');
         if ( ! empty($role) ) {
                 $role->add_cap('delete_posts');
         }
@@ -482 +482 @@
  * @since 2.3.0
  */
 function populate_roles_230() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
                 $role->add_cap( 'unfiltered_upload' );
@@ -495 +495 @@
  * @since 2.5.0
  */
 function populate_roles_250() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
                 $role->add_cap( 'edit_dashboard' );
@@ -508 +508 @@
  * @since 2.6.0
  */
 function populate_roles_260() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
                 $role->add_cap( 'update_plugins' );
@@ -522 +522 @@
  * @since 2.7.0
  */
 function populate_roles_270() {
-        $role = get_role( 'administrator' );
+        $role =& get_role( 'administrator' );
 
         if ( !empty( $role ) ) {
                 $role->add_cap( 'install_plugins' );

wp-includes/capabilities.php

@@ -533 +533 @@
                 //Build $allcaps from role caps, overlay user's $caps
                 $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 );
                 }
                 $this->allcaps = array_merge( $this->allcaps, $this->caps );