WordPress 3.9-scripts

[autoinstalls/wordpress.git] / wp-admin / network / themes.php

diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index ba56a4a483e9eab02dc2a274fe267747d7ceafc3..230463f328f5ce591d762ee67abb16dc6099d098 100644 (file)
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -8,16 +8,11 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
-$menu_perms = get_site_option( 'menu_items', array() );
-
-if ( empty( $menu_perms['themes'] ) && ! is_super_admin() )
-       wp_die( __( 'Cheatin’ uh?' ) );
-
 if ( !current_user_can('manage_network_themes') )
        wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
 
@@ -95,7 +90,6 @@ if ( $action ) {
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                        echo '<div class="wrap">';
-                       screen_icon();
                        echo '<h2>' . esc_html( $title ) . '</h2>';
 
                        $url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
@@ -142,7 +136,6 @@ if ( $action ) {
                        <div class="wrap">
                                <?php
                                        $themes_to_delete = count( $themes );
-                                       screen_icon();
                                        echo '<h2>' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '</h2>';
                                ?>
                                <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This theme may be active on other sites in the network.', 'These themes may be active on other sites in the network.', $themes_to_delete ); ?></p></div>
@@ -181,10 +174,21 @@ if ( $action ) {
                                exit;
                        } // Endif verify-delete
 
-                       foreach ( $themes as $theme )
-                               $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
+                       foreach ( $themes as $theme ) {
+                               $delete_result = delete_theme( $theme, esc_url( add_query_arg( array(
+                                       'verify-delete' => 1,
+                                       'action' => 'delete-selected',
+                                       'checked' => $_REQUEST['checked'],
+                                       '_wpnonce' => $_REQUEST['_wpnonce']
+                               ), network_admin_url( 'themes.php' ) ) ) );
+                       }
+                       
                        $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
-                       wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
+                       wp_redirect( add_query_arg( array(
+                               'deleted' => count( $themes ),
+                               'paged' => $paged,
+                               's' => $s
+                       ), network_admin_url( 'themes.php' ) ) );
                        exit;
                        break;
        }
@@ -208,18 +212,19 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 $title = __('Themes');
 $parent_file = 'themes.php';
 
+wp_enqueue_script( 'theme-preview' );
+
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<?php screen_icon('themes'); ?>
 <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
 if ( $s )
        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>