WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct variable; return correct value for get_screenshot() when value is uncached. see #20103. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-02-29 20:46:41 +00:00
parent 8570f2dcd2
commit a48a695ba7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-theme.php
View File

@ -458,7 +458,7 @@ final class WP_Theme implements ArrayAccess {
if ( ! isset( $this->headers_sanitized ) ) { if ( ! isset( $this->headers_sanitized ) ) {
$this->headers_sanitized = $this->cache_get( 'headers' ); $this->headers_sanitized = $this->cache_get( 'headers' );
if ( ! is_array( $this->headers_sanitized ) ) if ( ! is_array( $this->headers_sanitized ) )
$headers = array(); $this->headers_sanitized = array();
} }
if ( isset( $this->headers_sanitized[ $header ] ) ) if ( isset( $this->headers_sanitized[ $header ] ) )
@ -807,9 +807,9 @@ final class WP_Theme implements ArrayAccess {
foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) { foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) { if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
$this->cache_add( 'screenshot', 'screenshot.' . $ext ); $this->cache_add( 'screenshot', 'screenshot.' . $ext );
if ( 'absolute' == $uri ) if ( 'relative' == $uri )
return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
return 'screenshot.' . $ext; return 'screenshot.' . $ext;
return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
} }
} }