Wordpress 4.6

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

diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index e326c93cb6fbda847a11a9c777e14781f5165aea..171afc359da942bff2052b8765deefadbbad38d3 100644 (file)
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -14,7 +14,7 @@ if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( !current_user_can('manage_network_themes') )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 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();
 
 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 $pagenum = $wp_list_table->get_pagenum();


@@ -29,12 +29,10 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
 $referer = remove_query_arg( $temp_args, wp_get_referer() );
 
 if ( $action ) {
 $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']);
        switch ( $action ) {
                case 'enable':
                        check_admin_referer('enable-theme_' . $_GET['theme']);

-                       $allowed_themes[ $_GET['theme'] ] = true;
-                       update_site_option( 'allowedthemes', $allowed_themes );
+                       WP_Theme::network_enable_theme( $_GET['theme'] );

                        if ( false === strpos( $referer, '/network/themes.php' ) )
                                wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
                        else
                        if ( false === strpos( $referer, '/network/themes.php' ) )
                                wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
                        else


@@ -42,8 +40,7 @@ if ( $action ) {
                        exit;
                case 'disable':
                        check_admin_referer('disable-theme_' . $_GET['theme']);
                        exit;
                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;
                case 'enable-selected':
                        wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                        exit;
                case 'enable-selected':


@@ -53,9 +50,7 @@ if ( $action ) {
                                wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
                                exit;
                        }
                                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;
                case 'disable-selected':
                        wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
                        exit;
                case 'disable-selected':


@@ -65,9 +60,7 @@ if ( $action ) {
                                wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
                                exit;
                        }
                                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;
                case 'update-selected' :
                        wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
                        exit;
                case 'update-selected' :


@@ -86,7 +79,7 @@ if ( $action ) {
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                        echo '<div class="wrap">';
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                        echo '<div class="wrap">';

-                       echo '<h2>' . esc_html( $title ) . '</h2>';
+                       echo '<h1>' . esc_html( $title ) . '</h1>';

 
                        $url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
                        $url = wp_nonce_url($url, 'bulk-update-themes');
 
                        $url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
                        $url = wp_nonce_url($url, 'bulk-update-themes');


@@ -97,7 +90,7 @@ if ( $action ) {
                        exit;
                case 'delete-selected':
                        if ( ! current_user_can( 'delete_themes' ) ) {
                        exit;
                case 'delete-selected':
                        if ( ! current_user_can( 'delete_themes' ) ) {

-                               wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
+                               wp_die( __('Sorry, you are not allowed to delete themes for this site.') );

                        }
 
                        check_admin_referer( 'bulk-themes' );
                        }
 
                        check_admin_referer( 'bulk-themes' );


@@ -116,27 +109,9 @@ if ( $action ) {
                                exit;
                        }
 
                                exit;
                        }
 

-                       $files_to_delete = $theme_info = array();
-                       $theme_translations = wp_get_installed_translations( 'themes' );
+                       $theme_info = array();

                        foreach ( $themes as $key => $theme ) {
                                $theme_info[ $theme ] = wp_get_theme( $theme );
                        foreach ( $themes as $key => $theme ) {
                                $theme_info[ $theme ] = wp_get_theme( $theme );

-
-                               // Locate all the files in that folder.
-                               $files = list_files( $theme_info[ $theme ]->get_stylesheet_directory() );
-                               if ( $files ) {
-                                       $files_to_delete = array_merge( $files_to_delete, $files );
-                               }
-
-                               // Add translation files.
-                               $theme_slug = $theme_info[ $theme ]->get_stylesheet();
-                               if ( ! empty( $theme_translations[ $theme_slug ] ) ) {
-                                       $translations = $theme_translations[ $theme_slug ];
-
-                                       foreach ( $translations as $translation => $data ) {
-                                               $files_to_delete[] = $theme_slug . '-' . $translation . '.po';
-                                               $files_to_delete[] = $theme_slug . '-' . $translation . '.mo';
-                                       }
-                               }

                        }
 
                        include(ABSPATH . 'wp-admin/update.php');
                        }
 
                        include(ABSPATH . 'wp-admin/update.php');


@@ -146,23 +121,35 @@ if ( $action ) {
                        if ( ! isset( $_REQUEST['verify-delete'] ) ) {
                                wp_enqueue_script( 'jquery' );
                                require_once( ABSPATH . 'wp-admin/admin-header.php' );
                        if ( ! isset( $_REQUEST['verify-delete'] ) ) {
                                wp_enqueue_script( 'jquery' );
                                require_once( ABSPATH . 'wp-admin/admin-header.php' );

+                               $themes_to_delete = count( $themes );

                                ?>
                        <div class="wrap">
                                ?>
                        <div class="wrap">

-                               <?php
-                                       $themes_to_delete = count( $themes );
-                                       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>
+                               <?php if ( 1 == $themes_to_delete ) : ?>
+                                       <h1><?php _e( 'Delete Theme' ); ?></h1>
+                                       <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This theme may be active on other sites in the network.' ); ?></p></div>
+                                       <p><?php _e( 'You are about to remove the following theme:' ); ?></p>
+                               <?php else : ?>
+                                       <h1><?php _e( 'Delete Themes' ); ?></h1>
+                                       <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These themes may be active on other sites in the network.' ); ?></p></div>
+                                       <p><?php _e( 'You are about to remove the following themes:' ); ?></p>
+                               <?php endif; ?>

                                        <ul class="ul-disc">
                                        <?php
                                                foreach ( $theme_info as $theme ) {
                                        <ul class="ul-disc">
                                        <?php
                                                foreach ( $theme_info as $theme ) {

-                                                       /* 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>';
+                                                       echo '<li>' . sprintf(
+                                                               /* translators: 1: theme name, 2: theme author */
+                                                               _x( '%1$s by %2$s', 'theme' ),
+                                                               '<strong>' . $theme->display( 'Name' ) . '</strong>',
+                                                               '<em>' . $theme->display( 'Author' ) . '</em>'
+                                                       ) . '</li>';

                                                }
                                        ?>
                                        </ul>
                                                }
                                        ?>
                                        </ul>

-                               <p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
+                               <?php if ( 1 == $themes_to_delete ) : ?>
+                                       <p><?php _e( 'Are you sure you wish to delete this theme?' ); ?></p>
+                               <?php else : ?>
+                                       <p><?php _e( 'Are you sure you wish to delete these themes?' ); ?></p>
+                               <?php endif; ?>

                                <form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
                                        <input type="hidden" name="verify-delete" value="1" />
                                        <input type="hidden" name="action" value="delete-selected" />
                                <form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
                                        <input type="hidden" name="verify-delete" value="1" />
                                        <input type="hidden" name="action" value="delete-selected" />


@@ -170,24 +157,22 @@ if ( $action ) {
                                                foreach ( (array) $themes as $theme ) {
                                                        echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
                                                }
                                                foreach ( (array) $themes as $theme ) {
                                                        echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
                                                }

-                                       ?>
-                                       <?php wp_nonce_field('bulk-themes') ?>
-                                       <?php submit_button( _n( 'Yes, Delete this theme', 'Yes, Delete these themes', $themes_to_delete ), 'button', 'submit', false ); ?>
-                               </form>
-                               <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
-                                       <?php submit_button( __( 'No, Return me to the theme list' ), 'button', 'submit', false ); ?>
-                               </form>

 
 

-                               <p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php _e('Click to view entire list of files which will be deleted'); ?></a></p>
-                               <div id="files-list" style="display:none;">
-                                       <ul class="code">
-                                       <?php
-                                               foreach ( (array) $files_to_delete as $file ) {
-                                                       echo '<li>' . esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ) . '</li>';
+                                               wp_nonce_field( 'bulk-themes' );
+
+                                               if ( 1 == $themes_to_delete ) {
+                                                       submit_button( __( 'Yes, delete this theme' ), 'button', 'submit', false );
+                                               } else {
+                                                       submit_button( __( 'Yes, delete these themes' ), 'button', 'submit', false );

                                                }
                                        ?>
                                                }
                                        ?>

-                                       </ul>
-                               </div>
+                               </form>
+                               <?php
+                               $referer = wp_get_referer();
+                               ?>
+                               <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
+                                       <?php submit_button( __( 'No, return me to the theme list' ), 'button', 'submit', false ); ?>
+                               </form>

                        </div>
                                <?php
                                require_once(ABSPATH . 'wp-admin/admin-footer.php');
                        </div>
                                <?php
                                require_once(ABSPATH . 'wp-admin/admin-footer.php');


@@ -217,7 +202,7 @@ $wp_list_table->prepare_items();
 
 add_thickbox();
 
 
 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',
 
 get_current_screen()->add_help_tab( array(
        'id'      => 'overview',


@@ -230,13 +215,20 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
 
 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="https://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .

        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
        '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 

+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';
 
 $title = __('Themes');
 $parent_file = 'themes.php';
 

+wp_enqueue_script( 'updates' );

 wp_enqueue_script( 'theme-preview' );
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 wp_enqueue_script( 'theme-preview' );
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');


@@ -244,30 +236,48 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 ?>
 
 <div class="wrap">

-<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 ) ); ?>
-</h2>
+<h1><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+       /* translators: %s: search keywords */
+       printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+}
+?>
+</h1>

 
 <?php
 if ( isset( $_GET['enabled'] ) ) {
 
 <?php
 if ( isset( $_GET['enabled'] ) ) {

-       $_GET['enabled'] = absint( $_GET['enabled'] );
-       echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
+       $enabled = absint( $_GET['enabled'] );
+       if ( 1 == $enabled ) {
+               $message = __( 'Theme enabled.' );
+       } else {
+               $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+       }
+       echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';

 } elseif ( isset( $_GET['disabled'] ) ) {
 } elseif ( isset( $_GET['disabled'] ) ) {

-       $_GET['disabled'] = absint( $_GET['disabled'] );
-       echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
+       $disabled = absint( $_GET['disabled'] );
+       if ( 1 == $disabled ) {
+               $message = __( 'Theme disabled.' );
+       } else {
+               $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+       }
+       echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';

 } elseif ( isset( $_GET['deleted'] ) ) {
 } elseif ( isset( $_GET['deleted'] ) ) {

-       $_GET['deleted'] = absint( $_GET['deleted'] );
-       echo '<div id="message" class="updated"><p>' . sprintf( _nx( 'Theme deleted.', '%s themes deleted.', $_GET['deleted'], 'network' ), number_format_i18n( $_GET['deleted'] ) ) . '</p></div>';
+       $deleted = absint( $_GET['deleted'] );
+       if ( 1 == $deleted ) {
+               $message = __( 'Theme deleted.' );
+       } else {
+               $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+       }
+       echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';

 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {

-       echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
+       echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';

 } elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {
 } elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {

-       echo '<div class="error"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
+       echo '<div class="error notice is-dismissible"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';

 }
 
 ?>
 
 }
 
 ?>
 

-<form method="get" action="">
+<form method="get">

 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
 </form>
 
 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
 </form>
 


@@ -275,10 +285,10 @@ if ( isset( $_GET['enabled'] ) ) {
 $wp_list_table->views();
 
 if ( 'broken' == $status )
 $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>';
+       echo '<p class="clear">' . __( 'The following themes are installed but incomplete.' ) . '</p>';

 ?>
 
 ?>
 

-<form method="post" action="">
+<form id="bulk-action-form" method="post">

 <input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />
 <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 
 <input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />
 <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 


@@ -288,4 +298,8 @@ if ( 'broken' == $status )
 </div>
 
 <?php
 </div>
 
 <?php

+wp_print_request_filesystem_credentials_modal();
+wp_print_admin_notice_templates();
+wp_print_update_row_templates();
+

 include(ABSPATH . 'wp-admin/admin-footer.php');
 include(ABSPATH . 'wp-admin/admin-footer.php');