Changeset 20029 for trunk/wp-admin/themes.php

Timestamp:

02/28/2012 09:24:44 PM (13 years ago)

Author:

nacin

Message:

Introduce WP_Theme, wp_get_themes(), and wp_get_theme() to replace get_themes(), get_theme(), get_theme_data(), current_theme_info(), and others.

• Getters and Helpers: Introduces a series of methods to allow for easy generation of headers for display, and other theme metadata, including page templates.
• Screenshots: Handles support for multiple screenshots. (see # Additional screenshots must be PNG and start with screenshot-2.png, and be sequential to be counted. see #19816.
• Error Handling: Broken themes have a WP_Error object attached to them.
• Caching: Introduces a wp_cache_themes_persistently filter (also in [20020]) to enable persistent caching of all filesystem and sanitization operations normally handled by WP_Theme (and formerly get_file_data() and get_themes()). Themes are cached individually and across five different cache keys for different data pieces.
• Compatibility: A WP_Theme object is backwards compatible with a theme's array formerly returned by get_themes() and get_theme(), and an stdClass object formerly returned by current_theme_info().
• i18n/L10n: Theme headers are now localizable with proper Text Domain and Domain Path headers, like plugins. (Language packs may remove the requirement for headers.) For page templates, see #6007 (not fixed yet, but will be easy now). For headers, fixes #15858.
• PHP and CSS files: New methods that fetch a list of theme files (for the theme editor) only on demand, rather than only loading them into memory. fixes #11214.

Functions deprecated:

• get_themes(), get_allowed_themes() and get_broken_themes() -- use wp_get_themes()
• get_theme() and current_theme_info() -- use wp_get_theme()
• get_site_allowed_themes() -- use WP_Theme::get_allowed_on_network()
• wpmu_get_blog_allowedthemes() -- use WP_theme::get_allowed_on_site()

see also [20016], [20018], [20019], [20020], [20021], [20022], [20025], [20026], [20027]. also fixes #19244.

see #20103.

File:

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

trunk/wp-admin/themes.php

@@ -97 +97 @@
 <?php endif; ?>
 </h2>
-
-<h3><?php _e('Current Theme'); ?></h3>
+<?php $ct = wp_get_theme(); ?>
+<h3><?php _e( 'Current Theme' ); ?></h3>
 <div id="current-theme">
-<?php if ( $ct->screenshot ) : ?>
-<img src="<?php echo $ct->theme_root_uri . '/' . $ct->stylesheet . '/' . $ct->screenshot; ?>" alt="<?php esc_attr_e('Current theme preview'); ?>" />
+<?php if ( $ct->get_screenshot() ) : ?>
+<img src="<?php echo $ct->get_screenshot( 'absolute' ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
 <?php endif; ?>
 <h4><?php
     /* translators: 1: theme title, 2: theme version, 3: theme author */
-    printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
-<p class="theme-description"><?php echo $ct->description; ?></p>
+    printf( __( '%1$s %2$s by %3$s' ), $ct->display('Name'), $ct->display('Version'), $ct->display('Author') ) ; ?></h4>
+<p class="theme-description"><?php echo $ct->display('Description'); ?></p>
 <div class="theme-options">
     <span><?php _e( 'Options:' )?></span>
@@ -118 +118 @@
                 continue;
             // 0 = name, 1 = capability, 2 = file
-            if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) $class = ' class="current"';
-
+            if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
+                $class = ' class="current"';
             if ( !empty($submenu[$item[2]]) ) {
                 $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
@@ -138 +138 @@
     echo implode ( ' | ', $options );
 
-    if ( $ct->tags ) : ?>
-    <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
+    if ( $ct->get('Tags') ) : ?>
+    <p><?php _e('Tags:'); ?> <?php echo $ct->display('Tags'); ?></p>
     <?php endif; ?>
 </div>
@@ -219 +219 @@
 <?php
 // List broken themes, if any.
-$broken_themes = get_broken_themes();
-if ( current_user_can('edit_themes') && count( $broken_themes ) ) {
+if ( current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
 ?>
 
@@ -232 +231 @@
     </tr>
 <?php
-    $theme = '';
-
-    $theme_names = array_keys($broken_themes);
-    natcasesort($theme_names);
-
-    foreach ($theme_names as $theme_name) {
-        $name = $broken_themes[$theme_name]['Title'];
-        $description = $broken_themes[$theme_name]['Description'];
-
-        $theme = ('class="alternate"' == $theme) ? '' : 'class="alternate"';
+    $alt = '';
+    foreach ( $broken_themes as $broken_theme ) {
+        $alt = ('class="alternate"' == $alt) ? '' : 'class="alternate"';
         echo "
-        <tr $theme>
-             <td>$name</td>
-             <td>$description</td>
+        <tr $alt>
+             <td>" . $broken_theme->get('Name') ."</td>
+             <td>" . $broken_theme->errors()->get_error_message() . "</td>
         </tr>";
     }