Changeset 20043

Timestamp:

02/29/2012 08:31:56 PM (15 years ago)

Author:

nacin

Message:

Have WP_Theme::get_screenshot() default to an absolute URI. Allow 'relative' to be requested. see #20103, see #19816.

Location:

trunk

Files:

• wp-admin/includes/class-wp-themes-list-table.php (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (5 diffs)
• wp-includes/customize-controls.php (modified) (1 diff)

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

@@ -153 +153 @@
                         ?>
                         <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 if ( $screenshot = $theme->get_screenshot() ) : ?>
+                                <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
                         <?php endif; ?>
                         </a>

trunk/wp-admin/themes.php

@@ -100 +100 @@
 <h3><?php _e( 'Current Theme' ); ?></h3>
 <div id="current-theme">
-<?php if ( $ct->get_screenshot() ) : ?>
-<img src="<?php echo $ct->get_screenshot( 'absolute' ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
+<?php if ( $screenshot = $ct->get_screenshot() ) : ?>
+<img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
 <?php endif; ?>
 <h4><?php

trunk/wp-includes/class-wp-theme.php

@@ -281 +281 @@
                                 return $this->get_stylesheet();
                         case 'screenshot' :
-                                return $this->get_screenshot();
+                                return $this->get_screenshot( 'relative' );
                         // 'author' and 'description' did not previously return translated data.
                         case 'description' :
@@ -361 +361 @@
                                 return $this->get_stylesheet_directory();
                         case 'Screenshot' :
-                                return $this->get_screenshot();
+                                return $this->get_screenshot( 'relative' );
                         case 'Tags' :
                                 return $this->get('Tags');
@@ -793 +793 @@
          * @access public
          *
-         * @param string $uri Type of URL to include, either relative or absolute. Defaults to relative.
+         * @param string $uri Type of URL to include, either 'relative' or an absolute URI. Defaults to absolute URI.
          * @return mixed Screenshot file. False if the theme does not have a screenshot.
          */
-        public function get_screenshot( $uri = 'relative' ) {
+        public function get_screenshot( $uri = 'uri' ) {
                 $screenshot = $this->cache_get( 'screenshot' );
                 if ( $screenshot ) {
-                        if ( 'absolute' == $uri )
-                                return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
-                        return $screenshot;
+                        if ( 'relative' == $uri )
+                                return $screenshot;
+                        return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
                 } elseif ( 0 === $screenshot ) {
                         return false;
@@ -841 +841 @@
                 // This will set the screenshot cache.
                 // If there is no screenshot, the screenshot_count cache will also be set.
-                if ( ! $screenshot = $this->get_screenshot() )
+                if ( ! $screenshot = $this->get_screenshot( 'relative' ) )
                         return 0;
 
@@ -869 +869 @@
                         return array();
 
-                $screenshots = array( $this->get_screenshot() );
+                $screenshots = array( $this->get_screenshot( 'relative' ) );
                 for ( $i = 2; $i <= $count; $i++ )
                         $screenshots[] = 'screenshot-' . $i . '.png';

trunk/wp-includes/customize-controls.php

@@ -29 +29 @@
 
 $theme = wp_get_theme();
-$screenshot = $theme->get_screenshot( 'absolute' );
+$screenshot = $theme->get_screenshot();
 
 // Let's roll.