Changeset 20037 for trunk/wp-admin/network/themes.php

Timestamp:

02/29/2012 07:50:56 AM (14 years ago)

Author:

nacin

Message:

Use wp_get_theme() rather than get_theme_data() in the verify theme deletion (multisite network) screen. see #20103.

File:

• trunk/wp-admin/network/themes.php (modified) (3 diffs)

trunk/wp-admin/network/themes.php

@@ -111 +111 @@
             $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 ) ) {
@@ -121 +118 @@
             }
 
-            $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() ) );
             }
 
@@ -156 +147 @@
                     <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>