X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..607b7e02d77e7326161e8ec15639052d2040f745:/wp-admin/network/themes.php
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 611c0957..171afc35 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -8,18 +8,13 @@
*/
/** 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.' ) );
+ wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
$pagenum = $wp_list_table->get_pagenum();
@@ -34,22 +29,20 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
$referer = remove_query_arg( $temp_args, wp_get_referer() );
if ( $action ) {
- $allowed_themes = get_site_option( 'allowedthemes' );
switch ( $action ) {
case 'enable':
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' ) );
+ WP_Theme::network_enable_theme( $_GET['theme'] );
+ 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':
check_admin_referer('disable-theme_' . $_GET['theme']);
- unset( $allowed_themes[ $_GET['theme'] ] );
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_disable_theme( $_GET['theme'] );
wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
exit;
- break;
case 'enable-selected':
check_admin_referer('bulk-themes');
$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -57,12 +50,9 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
- $allowed_themes[ $theme ] = true;
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_enable_theme( (array) $themes );
wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
exit;
- break;
case 'disable-selected':
check_admin_referer('bulk-themes');
$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -70,12 +60,9 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
- unset( $allowed_themes[ $theme ] );
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_disable_theme( (array) $themes );
wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
exit;
- break;
case 'update-selected' :
check_admin_referer( 'bulk-themes' );
@@ -92,9 +79,7 @@ if ( $action ) {
require_once(ABSPATH . 'wp-admin/admin-header.php');
echo '
';
- screen_icon();
- echo '
' . esc_html( $title ) . '
';
-
+ echo '' . esc_html( $title ) . '
';
$url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) ));
$url = wp_nonce_url($url, 'bulk-update-themes');
@@ -103,41 +88,32 @@ if ( $action ) {
echo '';
require_once(ABSPATH . 'wp-admin/admin-footer.php');
exit;
- break;
case 'delete-selected':
- if ( ! current_user_can( 'delete_themes' ) )
- wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
+ if ( ! current_user_can( 'delete_themes' ) ) {
+ wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
+ }
+
check_admin_referer( 'bulk-themes' );
$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' ) ] );
-
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;
- }
- }
+ $themes = array_diff( $themes, array( get_option( 'stylesheet' ), get_option( 'template' ) ) );
if ( empty( $themes ) ) {
wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );
exit;
}
+ $theme_info = array();
+ foreach ( $themes as $key => $theme ) {
+ $theme_info[ $theme ] = wp_get_theme( $theme );
+ }
+
include(ABSPATH . 'wp-admin/update.php');
$parent_file = 'themes.php';
@@ -145,55 +121,80 @@ if ( $action ) {
if ( ! isset( $_REQUEST['verify-delete'] ) ) {
wp_enqueue_script( 'jquery' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ $themes_to_delete = count( $themes );
?>
- ' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '';
- ?>
-
-
+
+
+
+
+
+
+
+
+
- ', sprintf( __('%1$s by %2$s' ), esc_html( $theme['Name'] ), esc_html( $theme['AuthorName'] ) ), ''; /* translators: 1: theme name, 2: theme author */ ?>
+ ' . sprintf(
+ /* translators: 1: theme name, 2: theme author */
+ _x( '%1$s by %2$s', 'theme' ),
+ '' . $theme->display( 'Name' ) . '',
+ '' . $theme->display( 'Author' ) . ''
+ ) . '';
+ }
+ ?>
-
+
+
+
+
+
-
-
-
-
-
- ' . esc_html( str_replace( WP_CONTENT_DIR . "/themes", '', $file) ) . '';
- ?>
-
-
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;
}
}
@@ -201,7 +202,7 @@ $wp_list_table->prepare_items();
add_thickbox();
-add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
+add_screen_option( 'per_page' );
get_current_screen()->add_help_tab( array(
'id' => 'overview',
@@ -214,49 +215,80 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'' . __('For more information:') . '
' .
- '' . __('Documentation on Network Themes') . '
' .
- '' . __('Support Forums') . '
'
+ '' . __('Documentation on Network Themes') . '
' .
+ '' . __('Support Forums') . '
'
);
+get_current_screen()->set_screen_reader_content( array(
+ 'heading_views' => __( 'Filter themes list' ),
+ 'heading_pagination' => __( 'Themes list navigation' ),
+ 'heading_list' => __( 'Themes list' ),
+) );
+
$title = __('Themes');
$parent_file = 'themes.php';
+wp_enqueue_script( 'updates' );
+wp_enqueue_script( 'theme-preview' );
+
require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
-
-
' . __('Search results for “%s”') . '', esc_html( $s ) ); ?>
-
+
' . __( 'Search results for “%s”' ) . '', esc_html( $s ) );
+}
+?>
+
' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '
';
+ $enabled = absint( $_GET['enabled'] );
+ if ( 1 == $enabled ) {
+ $message = __( 'Theme enabled.' );
+ } else {
+ $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+ }
+ echo '' . sprintf( $message, number_format_i18n( $enabled ) ) . '
';
} elseif ( isset( $_GET['disabled'] ) ) {
- $_GET['disabled'] = absint( $_GET['disabled'] );
- echo '' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '
';
+ $disabled = absint( $_GET['disabled'] );
+ if ( 1 == $disabled ) {
+ $message = __( 'Theme disabled.' );
+ } else {
+ $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+ }
+ echo '' . sprintf( $message, number_format_i18n( $disabled ) ) . '
';
} elseif ( isset( $_GET['deleted'] ) ) {
- $_GET['deleted'] = absint( $_GET['deleted'] );
- echo '' . sprintf( _nx( 'Theme deleted.', '%s themes deleted.', $_GET['deleted'], 'network' ), number_format_i18n( $_GET['deleted'] ) ) . '
';
+ $deleted = absint( $_GET['deleted'] );
+ if ( 1 == $deleted ) {
+ $message = __( 'Theme deleted.' );
+ } else {
+ $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+ }
+ echo '' . sprintf( $message, number_format_i18n( $deleted ) ) . '
';
} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
- echo '' . __( 'No theme selected.' ) . '
';
+ echo '' . __( 'No theme selected.' ) . '
';
} elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {
- echo '' . __( 'You cannot delete a theme while it is active on the main site.' ) . '
';
+ echo '' . __( 'You cannot delete a theme while it is active on the main site.' ) . '
';
}
?>
-
-views(); ?>
+views();
+
+if ( 'broken' == $status )
+ echo '' . __( 'The following themes are installed but incomplete.' ) . '
';
+?>
-