Ticket #18599: 18599.patch

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

@@ -149 +149 @@
         $version = $themes[$theme_name]['Version'];
         $description = $themes[$theme_name]['Description'];
         $author = $themes[$theme_name]['Author'];
-        $screenshot = $themes[$theme_name]['Screenshot'];
+        $screenshot_uri = $themes[$theme_name]['Screenshot URI'];
         $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
         $template_dir = $themes[$theme_name]['Template Dir'];
         $parent_theme = $themes[$theme_name]['Parent Theme'];
@@ -174 +174 @@
         $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 if ( $screenshot_uri ) : ?>
+                        <img src="<?php echo esc_url( $screenshot_uri ); ?>" alt="" />
 <?php endif; ?>
                 </a>
 <h3><?php

wp-admin/includes/theme.php

@@ -29 +29 @@
         $ct->stylesheet_dir = $themes[$current_theme]['Stylesheet Dir'];
         $ct->template = $themes[$current_theme]['Template'];
         $ct->stylesheet = $themes[$current_theme]['Stylesheet'];
-        $ct->screenshot = $themes[$current_theme]['Screenshot'];
+        $ct->screenshot = $themes[$current_theme]['Screenshot']; // Deprecated
+        $ct->screenshot_uri = $themes[$current_theme]['Screenshot URI'];
         $ct->description = $themes[$current_theme]['Description'];
         $ct->author = $themes[$current_theme]['Author'];
         $ct->tags = $themes[$current_theme]['Tags'];

wp-admin/themes.php

@@ -80 +80 @@
 
 <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 _e('Current theme preview'); ?>" />
+<?php if ( $ct->screenshot_uri ) : ?>
+<img src="<?php echo esc_url( $ct->screenshot_uri ); ?>" alt="<?php _e('Current theme preview'); ?>" />
 <?php endif; ?>
 <h4><?php
         /* translators: 1: theme title, 2: theme version, 3: theme author */

wp-includes/theme.php

@@ -293 +293 @@
                 $template    = $theme_data['Template'];
                 $stylesheet  = dirname($theme_file);
 
-                $screenshot = false;
-                foreach ( array('png', 'gif', 'jpg', 'jpeg') as $ext ) {
-                        if (file_exists("$theme_root/$stylesheet/screenshot.$ext")) {
-                                $screenshot = "screenshot.$ext";
-                                break;
-                        }
-                }
-
                 if ( empty($name) ) {
                         $name = dirname($theme_file);
                         $title = $name;
@@ -417 +409 @@
                         }
                 }
 
+                list( $screenshot, $screenshot_uri ) = get_theme_screenshot( $stylesheet_dir, $template_dir );
+
                 $theme_roots[$stylesheet] = str_replace( WP_CONTENT_DIR, '', $theme_root );
                 $wp_themes[$name] = array(
                         'Name' => $name,
@@ -434 +428 @@
                         'Stylesheet Dir' => $stylesheet_dir,
                         'Status' => $theme_data['Status'],
                         'Screenshot' => $screenshot,
+                        'Screenshot URI' => $screenshot_uri,
                         'Tags' => $theme_data['Tags'],
                         'Theme Root' => $theme_root,
                         'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ),
@@ -465 +460 @@
 }
 
 /**
+ * Get a theme's screenshot filename and URI. Checks parent too for child themes.
+ *
+ * @since 3.3.0
+ *
+ */
+function get_theme_screenshot( $stylesheet_dir, $template_dir = null ) {
+        $extensions = array( 'png', 'gif', 'jpg', 'jpeg' );
+
+        $screenshot = $screenshot_uri = false;
+
+        // Check current theme folder
+        foreach ( $extensions as $ext ) {
+                $check_path = "$stylesheet_dir/screenshot.$ext";
+                if ( file_exists( $check_path ) ) {
+                        return array(
+                                "screenshot.$ext",
+                                str_replace( WP_CONTENT_DIR, content_url(), $check_path ),
+                        );
+                }
+        }
+
+        // Okay, maybe the parent folder has a screenshot
+        if ( $template_dir && $template_dir != $stylesheet_dir ) {
+                foreach ( $extensions as $ext ) {
+                        $check_path = "$template_dir/screenshot.$ext";
+                        if ( file_exists( $check_path ) ) {
+                                return array(
+                                        false,
+                                        str_replace( WP_CONTENT_DIR, content_url(), $check_path ),
+                                );
+                        }
+                }
+        }
+
+        return array( false, false );
+}
+
+/**
  * Retrieve theme roots.
  *
  * @since 2.9.0