Changeset 52947

Timestamp:

03/17/2022 10:19:58 PM (3 years ago)

Author:

audrasjb

Message:

Themes: Add version to theme screenshot URL for better browser cache handling.

This change appends the theme version number to the URL of screenshots that appear in various place of the WordPress Admin. As a result, browsers will be able to refresh the screenshot as needed when the theme is updated.

Props codente, desrosj, audrasjb, SergeyBiryukov.
Fixes #53370.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-theme-install-list-table.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-admin/theme-install.php (modified) (2 diffs)
• wp-admin/themes.php (modified) (3 diffs)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/customize/class-wp-customize-theme-control.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

@@ -360 +360 @@
         ?>
         <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
-            <img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
+            <img src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" width="150" alt="" />
         </a>
 
@@ -503 +503 @@
             </span>
             <?php if ( isset( $theme->screenshot_url ) ) : ?>
-                <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
+                <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url . '?ver=' . $theme->version ); ?>" alt="" />
             <?php endif; ?>
             <div class="theme-details">

trunk/src/wp-admin/includes/theme.php

@@ -824 +824 @@
                 <div class="theme-screenshots">
                 <# if ( data.screenshot && data.screenshot[0] ) { #>
-                    <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
+                    <div class="screenshot"><img src="{{ data.screenshot[0] }}?ver={{ data.version }}" alt="" /></div>
                 <# } else { #>
                     <div class="screenshot blank"></div>

trunk/src/wp-admin/theme-install.php

@@ -283 +283 @@
     <# if ( data.screenshot_url ) { #>
         <div class="theme-screenshot">
-            <img src="{{ data.screenshot_url }}" alt="" />
+            <img src="{{ data.screenshot_url }}?ver={{ data.version }}" alt="" />
         </div>
     <# } else { #>
@@ -457 +457 @@
                     </span>
 
-                    <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
+                    <img class="theme-screenshot" src="{{ data.screenshot_url }}?ver={{ data.version }}" alt="" />
 
                     <div class="theme-details">

trunk/src/wp-admin/themes.php

@@ -389 +389 @@
     <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
         <div class="theme-screenshot">
-            <img src="<?php echo esc_attr( $theme['screenshot'][0] ); ?>" alt="" />
+            <img src="<?php echo esc_attr( $theme['screenshot'][0] . '?ver=' . $theme['version'] ); ?>" alt="" />
         </div>
     <?php } else { ?>
@@ -740 +740 @@
     <# if ( data.screenshot[0] ) { #>
         <div class="theme-screenshot">
-            <img src="{{ data.screenshot[0] }}" alt="" />
+            <img src="{{ data.screenshot[0] }}?ver={{ data.version }}" alt="" />
         </div>
     <# } else { #>
@@ -948 +948 @@
             <div class="theme-screenshots">
             <# if ( data.screenshot[0] ) { #>
-                <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
+                <div class="screenshot"><img src="{{ data.screenshot[0] }}?ver={{ data.version }}" alt="" /></div>
             <# } else { #>
                 <div class="screenshot blank"></div>

trunk/src/wp-admin/update-core.php

@@ -756 +756 @@
         </td>
         <td class="plugin-title"><p>
-            <img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
+            <img src="<?php echo esc_url( $theme->get_screenshot() . '?ver=' . $theme->version ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
             <strong><?php echo $theme->display( 'Name' ); ?></strong>
             <?php

trunk/src/wp-includes/customize/class-wp-customize-theme-control.php

@@ -75 +75 @@
             <# if ( data.theme.screenshot && data.theme.screenshot[0] ) { #>
                 <div class="theme-screenshot">
-                    <img data-src="{{ data.theme.screenshot[0] }}" alt="" />
+                    <img data-src="{{ data.theme.screenshot[0] }}?ver={{ data.theme.version }}" alt="" />
                 </div>
             <# } else { #>