Changeset 14189
- Timestamp:
- 04/22/2010 07:48:13 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/schema.php
r14176 r14189 608 608 if ( !empty( $role ) ) { 609 609 $role->add_cap( 'update_core' ); 610 $role->add_cap( 'list_users' ); 610 611 $role->add_cap( 'remove_users' ); 611 612 $role->add_cap( 'add_users' ); -
trunk/wp-admin/includes/template.php
r14176 r14189 1813 1813 $checkbox = ''; 1814 1814 // Check if the user for this row is editable 1815 if ( current_user_can( ' edit_user', $user_object->ID ) ) {1815 if ( current_user_can( 'list_users', $user_object->ID ) ) { 1816 1816 // Set up the user editing link 1817 1817 // TODO: make profile/user-edit determination a separate function … … 1825 1825 // Set up the hover actions for this user 1826 1826 $actions = array(); 1827 $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; 1827 1828 if ( current_user_can('edit_user', $user_object->ID) ) 1829 $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>'; 1828 1830 if ( !is_multisite() && $current_user->ID != $user_object->ID && current_user_can('delete_user', $user_object->ID) ) 1829 1831 $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&user=$user_object->ID", 'bulk-users') . "'>" . __('Delete') . "</a>"; -
trunk/wp-admin/includes/upgrade.php
r14169 r14189 441 441 upgrade_290(); 442 442 443 if ( $wp_current_db_version < 1413 8)443 if ( $wp_current_db_version < 14139 ) 444 444 upgrade_300(); 445 445 … … 1109 1109 global $wp_current_db_version, $wpdb; 1110 1110 1111 if ( $wp_current_db_version < 1 2751) {1111 if ( $wp_current_db_version < 14139 ) { 1112 1112 populate_roles_300(); 1113 1113 if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) … … 1116 1116 1117 1117 // #11866 (Convert the taxonomy children cache into a transient) - Remove old cache. 1118 if ( $wp_current_db_version < 1413 8) {1118 if ( $wp_current_db_version < 14139 ) { 1119 1119 foreach ( get_taxonomies( array('hierarchical' => true) ) as $taxonomy ) 1120 1120 delete_option($taxonomy . '_children'); -
trunk/wp-admin/menu.php
r14127 r14189 173 173 unset($menu_perms, $update_plugins, $update_count); 174 174 175 if ( current_user_can(' edit_users') )176 $menu[70] = array( __('Users'), ' edit_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div' );175 if ( current_user_can('list_users') ) 176 $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div' ); 177 177 else 178 178 $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'div' ); 179 179 180 if ( current_user_can(' edit_users') ) {180 if ( current_user_can('list_users') ) { 181 181 $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php. 182 $submenu['users.php'][5] = array(__('Authors & Users'), ' edit_users', 'users.php');182 $submenu['users.php'][5] = array(__('Authors & Users'), 'list_users', 'users.php'); 183 183 $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php'); 184 184 -
trunk/wp-admin/users.php
r14178 r14189 13 13 require_once( ABSPATH . WPINC . '/registration.php'); 14 14 15 if ( !current_user_can(' edit_users') )15 if ( !current_user_can('list_users') ) 16 16 wp_die(__('Cheatin’ uh?')); 17 17 -
trunk/wp-includes/capabilities.php
r14176 r14189 807 807 break; 808 808 case 'edit_user': 809 if ( !isset( $args[0] ) || $user_id != $args[0] ) { 810 $caps[] = 'edit_users'; 811 } 809 // Allow user to edit itself 810 if ( isset( $args[0] ) && $user_id == $args[0] ) 811 break; 812 // Fall through 813 case 'edit_users': 814 // If multisite these caps are allowed only for super admins. 815 if ( is_multisite() && !is_super_admin() ) 816 $caps[] = 'do_not_allow'; 817 else 818 $caps[] = $cap; 812 819 break; 813 820 case 'delete_post': -
trunk/wp-includes/version.php
r14138 r14189 16 16 * @global int $wp_db_version 17 17 */ 18 $wp_db_version = 1413 8;18 $wp_db_version = 14139; 19 19 20 20 /**
Note: See TracChangeset
for help on using the changeset viewer.