Index: wp-includes/functions.php =================================================================== --- wp-includes/functions.php (revision 14495) +++ wp-includes/functions.php (working copy) @@ -2982,7 +2982,7 @@ */ function wp_widgets_add_menu() { global $submenu; - $submenu['themes.php'][7] = array( __( 'Widgets' ), 'switch_themes', 'widgets.php' ); + $submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' ); ksort( $submenu['themes.php'], SORT_NUMERIC ); } Index: wp-admin/admin-ajax.php =================================================================== --- wp-admin/admin-ajax.php (revision 14492) +++ wp-admin/admin-ajax.php (working copy) @@ -132,7 +132,7 @@ die(); break; case 'menu-quick-search': - if ( ! current_user_can( 'switch_themes' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) die('-1'); require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; @@ -399,7 +399,7 @@ case 'delete-menu-item' : $menu_item_id = (int) $_POST['menu-item']; check_admin_referer( 'delete-menu_item_' . $menu_item_id ); - if ( ! current_user_can( 'switch_themes' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) die('-1'); if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) @@ -817,7 +817,7 @@ $x->send(); break; case 'add-menu-item' : - if ( ! current_user_can( 'switch_themes' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) die('-1'); check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' ); @@ -1091,7 +1091,7 @@ die('1'); break; case 'menu-quick-search': - if ( ! current_user_can( 'switch_themes' ) ) + if ( ! current_user_can( 'edit_theme_options' ) ) die('-1'); require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; @@ -1328,7 +1328,7 @@ case 'widgets-order' : check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' ); - if ( !current_user_can('switch_themes') ) + if ( !current_user_can('edit_theme_options') ) die('-1'); unset( $_POST['savewidgets'], $_POST['action'] ); @@ -1358,7 +1358,7 @@ case 'save-widget' : check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' ); - if ( !current_user_can('switch_themes') || !isset($_POST['id_base']) ) + if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) ) die('-1'); unset( $_POST['savewidgets'], $_POST['action'] ); Index: wp-admin/includes/dashboard.php =================================================================== --- wp-admin/includes/dashboard.php (revision 14492) +++ wp-admin/includes/dashboard.php (working copy) @@ -356,11 +356,15 @@ } $num = number_format_i18n( $num_widgets ); - if ( current_user_can( 'switch_themes' ) ) { + $switch_themes = $ct->title; + if ( current_user_can( 'switch_themes') ) { echo '' . __('Change Theme') . ''; - printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + $switch_themes = '' . $switch_themes . ''; + } + if ( current_user_can( 'edit_theme_options' ) ) { + printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num); } else { - printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $ct->title, $num); + printf(_n('Theme %1$s with %2$s Widget', 'Theme %1$s with %2$s Widgets', $num_widgets), $switch_themes, $num); } } else { if ( current_user_can( 'switch_themes' ) ) { Index: wp-admin/custom-header.php =================================================================== --- wp-admin/custom-header.php (revision 14492) +++ wp-admin/custom-header.php (working copy) @@ -61,10 +61,10 @@ * @since 2.1.0 */ function init() { - if ( ! current_user_can('switch_themes') ) + if ( ! current_user_can('edit_theme_options') ) return; - $page = add_theme_page(__('Header'), __('Header'), 'switch_themes', 'custom-header', array(&$this, 'admin_page')); + $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page')); add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); add_action("admin_print_styles-$page", array(&$this, 'css_includes')); @@ -125,7 +125,7 @@ * @since 2.6.0 */ function take_action() { - if ( ! current_user_can('switch_themes') ) + if ( ! current_user_can('edit_theme_options') ) return; if ( isset( $_POST['textcolor'] ) ) { @@ -597,7 +597,7 @@ * @since 2.1.0 */ function admin_page() { - if ( ! current_user_can('switch_themes') ) + if ( ! current_user_can('edit_theme_options') ) wp_die(__('You do not have permission to customize headers.')); $step = $this->step(); if ( 1 == $step ) Index: wp-admin/menu.php =================================================================== --- wp-admin/menu.php (revision 14492) +++ wp-admin/menu.php (working copy) @@ -146,9 +146,15 @@ $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' ); -$menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' ); - $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php'); - $submenu['themes.php'][10] = array(__('Menus'), 'switch_themes', 'nav-menus.php'); +if ( current_user_can( 'switch_themes') ) { + $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' ); + $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php'); + $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php'); +} else { + $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' ); + $submenu['themes.php'][5] = array(__('Themes'), 'edit_theme_options', 'themes.php'); + $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' ); +} // Add 'Editor' to the bottom of the Appearence menu. add_action('admin_menu', '_add_themes_utility_last', 101); @@ -282,7 +288,7 @@ unset($sub_loop); // Loop over the top-level menu. -// Menus for which the original parent is not acessible due to lack of privs will have the next +// Menus for which the original parent is not accessible due to lack of privs will have the next // submenu in line be assigned as the new menu parent. foreach ( $menu as $id => $data ) { if ( empty($submenu[$data[2]]) ) Index: wp-admin/nav-menus.php =================================================================== --- wp-admin/nav-menus.php (revision 14492) +++ wp-admin/nav-menus.php (working copy) @@ -16,8 +16,8 @@ require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' ); // Permissions Check -if ( ! current_user_can('switch_themes') ) - wp_die( __( 'Cheatin’ uh?' )); +if ( ! current_user_can('edit_theme_options') ) + wp_die( __( 'Cheatin’ uh?' ) ); // Nav Menu CSS wp_admin_css( 'nav-menu' ); @@ -51,12 +51,9 @@ switch ( $action ) { case 'add-menu-item': - if ( current_user_can( 'switch_themes' ) ) { - check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' ); - if ( isset( $_REQUEST['menu-item'] ) ) { - wp_save_nav_menu_item( $nav_menu_selected_id, $_REQUEST['menu-item'] ); - } - } + check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' ); + if ( isset( $_REQUEST['menu-item'] ) ) + wp_save_nav_menu_item( $nav_menu_selected_id, $_REQUEST['menu-item'] ); break; case 'move-down-menu-item' : // moving down a menu item is the same as moving up the next in order Index: wp-admin/widgets.php =================================================================== --- wp-admin/widgets.php (revision 14492) +++ wp-admin/widgets.php (working copy) @@ -12,7 +12,7 @@ /** WordPress Administration Widgets API */ require_once(ABSPATH . 'wp-admin/includes/widgets.php'); -if ( ! current_user_can('switch_themes') ) +if ( ! current_user_can('edit_theme_options') ) wp_die( __( 'Cheatin’ uh?' )); wp_admin_css( 'widgets' ); Index: wp-admin/themes.php =================================================================== --- wp-admin/themes.php (revision 14492) +++ wp-admin/themes.php (working copy) @@ -9,10 +9,10 @@ /** WordPress Administration Bootstrap */ require_once('./admin.php'); -if ( !current_user_can('switch_themes') ) +if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') ) wp_die( __( 'Cheatin’ uh?' ) ); -if ( isset($_GET['action']) ) { +if ( current_user_can('switch_themes') && isset($_GET['action']) ) { if ( 'activate' == $_GET['action'] ) { check_admin_referer('switch-theme_' . $_GET['template']); switch_theme($_GET['template'], $_GET['stylesheet']); @@ -31,6 +31,8 @@ $title = __('Manage Themes'); $parent_file = 'themes.php'; +if ( current_user_can( 'switch_themes' ) ) : + $help = '

' . __('Themes give your WordPress style. Once a theme is installed, you may preview it, activate it or deactivate it here.') . '

'; if ( current_user_can('install_themes') ) { $help .= '

' . sprintf(__('You can find additional themes for your site by using the new Theme Browser/Installer functionality or by browsing the WordPress Theme Directory directly and installing manually. To install a theme manually, upload its ZIP archive with the new uploader or copy its folder via FTP into your wp-content/themes directory.'), 'theme-install.php', 'theme-install.php?tab=upload' ) . '

'; @@ -42,6 +44,8 @@ add_thickbox(); wp_enqueue_script( 'theme-preview' ); +endif; + require_once('./admin-header.php'); if ( is_multisite() && current_user_can('edit_themes') ) { ?>

Network Themes screen before they appear here.'), admin_url( 'ms-themes.php') ); ?>

+ if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>

widgets settings screen to configure them.'), admin_url( 'widgets.php' ) ); ?>

Visit site' ), home_url( '/' ) ); ?>

+'; + require( './admin-footer.php' ); + exit; +} +?>

Index: wp-admin/custom-background.php =================================================================== --- wp-admin/custom-background.php (revision 14492) +++ wp-admin/custom-background.php (working copy) @@ -52,10 +52,10 @@ * @since 3.0.0 */ function init() { - if ( ! current_user_can('switch_themes') ) + if ( ! current_user_can('edit_theme_options') ) return; - $page = add_theme_page(__('Background'), __('Background'), 'switch_themes', 'custom-background', array(&$this, 'admin_page')); + $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page')); add_action("load-$page", array(&$this, 'admin_load')); add_action("load-$page", array(&$this, 'take_action'), 49);