Changeset 20029 for trunk/wp-admin/includes/class-wp-themes-list-table.php

Timestamp:

02/28/2012 09:24:44 PM (12 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/includes/class-wp-themes-list-table.php (modified) (5 diffs)

trunk/wp-admin/includes/class-wp-themes-list-table.php

@@ -25 +25 @@
 
     function prepare_items() {
-        global $ct;
-
-        $ct = current_theme_info();
-
-        $themes = get_allowed_themes();
+        $themes = wp_get_themes( array( 'allowed' => true ) );
 
         if ( ! empty( $_REQUEST['s'] ) ) {
@@ -46 +42 @@
         if ( $this->search || $this->features ) {
             foreach ( $themes as $key => $theme ) {
-                if ( !$this->search_theme( $theme ) )
+                if ( ! $this->search_theme( $theme ) )
                     unset( $themes[ $key ] );
             }
         }
 
-        unset( $themes[$ct->name] );
-        uksort( $themes, "strnatcasecmp" );
+        unset( $themes[ get_option( 'stylesheet' ) ] );
+        WP_Theme::sort_by_name( $themes );
 
         $per_page = 999;
@@ -126 +122 @@
     function display_rows() {
         $themes = $this->items;
-        $theme_names = array_keys( $themes );
-        natcasesort( $theme_names );
-
-    foreach ( $theme_names as $theme_name ) {
-        $class = array( 'available-theme' );
-    ?>
-    <div class="<?php echo join( ' ', $class ); ?>">
-    <?php if ( !empty( $theme_name ) ) :
-    $template = $themes[$theme_name]['Template'];
-    $stylesheet = $themes[$theme_name]['Stylesheet'];
-    $title = $themes[$theme_name]['Title'];
-    $version = $themes[$theme_name]['Version'];
-    $description = $themes[$theme_name]['Description'];
-    $author = $themes[$theme_name]['Author'];
-    $screenshot = $themes[$theme_name]['Screenshot'];
-    $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
-    $template_dir = $themes[$theme_name]['Template Dir'];
-    $parent_theme = $themes[$theme_name]['Parent Theme'];
-    $theme_root = $themes[$theme_name]['Theme Root'];
-    $theme_root_uri = $themes[$theme_name]['Theme Root URI'];
-    $preview_link = esc_url( add_query_arg( array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ), home_url( '/' ) ) );
-    $preview_text = esc_attr( sprintf( __( 'Preview of &#8220;%s&#8221;' ), $title ) );
-    $tags = $themes[$theme_name]['Tags'];
-    $thickbox_class = 'thickbox thickbox-preview';
-    $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
-    $activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) );
-    $actions = array();
-    $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
-    $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>';
-    if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-        $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $theme_name ) ) . "' );" . '">' . __( 'Delete' ) . '</a>';
-    $actions = apply_filters( 'theme_action_links', $actions, $themes[$theme_name] );
-
-    $actions = implode ( ' | ', $actions );
-?>
-        <a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
-<?php if ( $screenshot ) : ?>
-            <img src="<?php echo $theme_root_uri . '/' . $stylesheet . '/' . $screenshot; ?>" alt="" />
-<?php endif; ?>
-        </a>
-<h3><?php
-    /* translators: 1: theme title, 2: theme version, 3: theme author */
-    printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
-
-<span class='action-links'><?php echo $actions ?></span>
-<span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
-<div class="themedetaildiv hide-if-js">
-<p><?php echo $description; ?></p>
-    <?php if ( current_user_can( 'edit_themes' ) && $parent_theme ) {
-    /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-    <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme ); ?></p>
-<?php } else { ?>
-    <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
-<?php } ?>
-<?php if ( $tags ) : ?>
-<p><?php _e( 'Tags:' ); ?> <?php echo join( ', ', $tags ); ?></p>
-<?php endif; ?>
-<?php endif; // end if not empty theme_name ?>
-</div>
-    <?php theme_update_available( $themes[$theme_name] ); ?>
-    </div>
-<?php } // end foreach $theme_names
+
+        foreach ( $themes as $theme ) {
+            echo '<div class="available-theme">';
+
+            $template = $theme->get_template();
+            $stylesheet = $theme->get_stylesheet();
+
+            $title = $theme->display('Name');
+            $version = $theme->display('Version');
+            $author = $theme->display('Author');
+ 
+            $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $template );
+            $preview_link = esc_url( add_query_arg(
+                array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ),
+                home_url( '/' ) ) );
+ 
+            $actions = array();
+            $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="'
+                . esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
+            $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="'
+                . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Preview' ) . '</a>';
+            if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
+                $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet )
+                    . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
+                    . "' );" . '">' . __( 'Delete' ) . '</a>';
+ 
+            $actions = apply_filters( 'theme_action_links', $actions, $theme );
+ 
+            $actions = implode ( ' | ', $actions );
+            ?>
+            <a href="<?php echo $preview_link; ?>" class="thickbox thickbox-preview screenshot">
+            <?php if ( $theme->get_screenshot() ) : ?>
+                <img src="<?php echo esc_url( $theme->get_screenshot( 'absolute' ) ); ?>" alt="" />
+            <?php endif; ?>
+            </a>
+            <h3><?php
+            /* translators: 1: theme title, 2: theme version, 3: theme author */
+            printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
+ 
+            <span class='action-links'><?php echo $actions ?></span>
+            <span class="separator hide-if-no-js">| </span><a href="#" class="theme-detail hide-if-no-js" tabindex='4'><?php _e('Details') ?></a>
+            <div class="themedetaildiv hide-if-js">
+            <p><?php echo $theme->display('Description'); ?></p>
+            <?php if ( current_user_can( 'edit_themes' ) && $theme->parent() ) :
+                /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
+                <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ),
+                    $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $title, $theme->parent()->display('Name') ); ?></p>
+            <?php else :
+                    /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir */ ?>
+                <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
+                    $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
+            <?php endif; ?>
+            <?php
+            if ( $theme->get('Tags') )
+                printf( '<p>' . __( 'Tags: %s.' ) . '</p>', $theme->display('Tags') );
+            ?>
+            </div>
+            <?php theme_update_available( $theme ); ?>
+            </div>
+        <?php
+        }
     }
 
@@ -194 +189 @@
         if ( $this->features ) {
             foreach ( $this->features as $word ) {
-                if ( ! in_array( $word, $theme['Tags'] ) )
+                if ( ! in_array( $word, $theme->get('Tags') ) )
                     return false;
             }
@@ -202 +197 @@
         if ( $this->search ) {
             foreach ( $this->search as $word ) {
-                if ( in_array( $word, $theme['Tags'] ) )
+                if ( in_array( $word, $theme->get('Tags') ) )
                     continue;
-            }
-
-            foreach ( array( 'Name', 'Title', 'Description', 'Author', 'Template', 'Stylesheet' ) as $header ) {
-                if ( false !== stripos( $theme[ $header ], $word ) )
-                    continue 2;
-            }
-
-            return false;
+
+                foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
+                    // Don't mark up; Do translate.
+                    if ( false !== stripos( $theme->display( $header, false, true ), $word ) )
+                        continue 2;
+                }
+
+                if ( false !== stripos( $theme->get_stylesheet(), $word ) )
+                    continue;
+
+                if ( false !== stripos( $theme->get_template(), $word ) )
+                    continue;
+ 
+                return false;
+            }
         }