X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..4713a14935b83517997f3c88f808eb41da55033d:/wp-admin/network/themes.php

diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 611c0957..230463f3 100644
--- 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.' ) );
 
@@ -40,7 +35,10 @@ if ( $action ) {
 			check_admin_referer('enable-theme_' . $_GET['theme']);
 			$allowed_themes[ $_GET['theme'] ] = true;
 			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+			if ( false === strpos( $referer, '/network/themes.php' ) )
+				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+			else
+				wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
 			exit;
 			break;
 		case 'disable':
@@ -92,10 +90,8 @@ 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) ));
 			$url = wp_nonce_url($url, 'bulk-update-themes');
 
@@ -111,26 +107,17 @@ if ( $action ) {
 
 			$themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
 
-			if ( isset( $themes[ get_option( 'template' ) ] ) )
-				unset( $themes[ get_option( 'template' ) ] );
-			if ( isset( $themes[ get_option( 'stylesheet' ) ] ) )
-				unset( $themes[ get_option( 'stylesheet' ) ] );
+			unset( $themes[ get_option( 'stylesheet' ) ], $themes[ get_option( 'template' ) ] );
 
 			if ( empty( $themes ) ) {
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
 
-			$main_theme = get_current_theme();
 			$files_to_delete = $theme_info = array();
 			foreach ( $themes as $key => $theme ) {
-				$data = get_theme_data( WP_CONTENT_DIR . '/themes/' . $theme . '/style.css' );
-				if ( $data['Name'] == $main_theme ) {
-					unset( $themes[$key] );
-				} else {
-					$files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
-					$theme_info[ $theme ] = $data;
-				}
+				$theme_info[ $theme ] = wp_get_theme( $theme );
+				$files_to_delete = array_merge( $files_to_delete, list_files( $theme_info[ $theme ]->get_stylesheet_directory() ) );
 			}
 
 			if ( empty( $themes ) ) {
@@ -149,14 +136,13 @@ 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>
 				<p><?php echo _n( 'You are about to remove the following theme:', 'You are about to remove the following themes:', $themes_to_delete ); ?></p>
 					<ul class="ul-disc">
 						<?php foreach ( $theme_info as $theme )
-							echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), esc_html( $theme['Name'] ), esc_html( $theme['AuthorName'] ) ), '</li>'; /* translators: 1: theme name, 2: theme author */ ?>
+							echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $theme->display('Name'), $theme->display('Author') ), '</li>'; /* translators: 1: theme name, 2: theme author */ ?>
 					</ul>
 				<p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
@@ -188,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;
 	}
@@ -215,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 ) ); ?>
@@ -254,7 +252,12 @@ if ( isset( $_GET['enabled'] ) ) {
 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
 </form>
 
-<?php $wp_list_table->views(); ?>
+<?php
+$wp_list_table->views();
+
+if ( 'broken' == $status )
+	echo '<p class="clear">' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '</p>';
+?>
 
 <form method="post" action="">
 <input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />