<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20043] trunk: Have WP_Theme::get_screenshot() default to an absolute URI.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20043">20043</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-02-29 20:31:56 +0000 (Wed, 29 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have WP_Theme::get_screenshot() default to an absolute URI. Allow 'relative' to be requested. see <a href="http://core.trac.wordpress.org/ticket/20103">#20103</a>, see <a href="http://core.trac.wordpress.org/ticket/19816">#19816</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunkwpincludescustomizecontrolsphp">trunk/wp-includes/customize-controls.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (20042 => 20043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-02-29 20:22:16 UTC (rev 20042)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2012-02-29 20:31:56 UTC (rev 20043)
</span><span class="lines">@@ -152,8 +152,8 @@
</span><span class="cx"> $actions = implode ( ' | ', $actions );
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $preview_link; ?>" class="thickbox thickbox-preview screenshot">
</span><del>- <?php if ( $theme->get_screenshot() ) : ?>
- <img src="<?php echo esc_url( $theme->get_screenshot( 'absolute' ) ); ?>" alt="" />
</del><ins>+ <?php if ( $screenshot = $theme->get_screenshot() ) : ?>
+ <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </a>
</span><span class="cx"> <h3><?php
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (20042 => 20043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2012-02-29 20:22:16 UTC (rev 20042)
+++ trunk/wp-admin/themes.php 2012-02-29 20:31:56 UTC (rev 20043)
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> <?php $ct = wp_get_theme(); ?>
</span><span class="cx"> <h3><?php _e( 'Current Theme' ); ?></h3>
</span><span class="cx"> <div id="current-theme">
</span><del>-<?php if ( $ct->get_screenshot() ) : ?>
-<img src="<?php echo $ct->get_screenshot( 'absolute' ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
</del><ins>+<?php if ( $screenshot = $ct->get_screenshot() ) : ?>
+<img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <h4><?php
</span><span class="cx"> /* translators: 1: theme title, 2: theme version, 3: theme author */
</span></span></pre></div>
<a id="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (20042 => 20043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-02-29 20:22:16 UTC (rev 20042)
+++ trunk/wp-includes/class-wp-theme.php 2012-02-29 20:31:56 UTC (rev 20043)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> case 'stylesheet' :
</span><span class="cx"> return $this->get_stylesheet();
</span><span class="cx"> case 'screenshot' :
</span><del>- return $this->get_screenshot();
</del><ins>+ return $this->get_screenshot( 'relative' );
</ins><span class="cx"> // 'author' and 'description' did not previously return translated data.
</span><span class="cx"> case 'description' :
</span><span class="cx"> return $this->display('Description');
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> case 'Stylesheet Dir' :
</span><span class="cx"> return $this->get_stylesheet_directory();
</span><span class="cx"> case 'Screenshot' :
</span><del>- return $this->get_screenshot();
</del><ins>+ return $this->get_screenshot( 'relative' );
</ins><span class="cx"> case 'Tags' :
</span><span class="cx"> return $this->get('Tags');
</span><span class="cx"> case 'Theme Root' :
</span><span class="lines">@@ -792,15 +792,15 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><del>- * @param string $uri Type of URL to include, either relative or absolute. Defaults to relative.
</del><ins>+ * @param string $uri Type of URL to include, either 'relative' or an absolute URI. Defaults to absolute URI.
</ins><span class="cx"> * @return mixed Screenshot file. False if the theme does not have a screenshot.
</span><span class="cx"> */
</span><del>- public function get_screenshot( $uri = 'relative' ) {
</del><ins>+ public function get_screenshot( $uri = 'uri' ) {
</ins><span class="cx"> $screenshot = $this->cache_get( 'screenshot' );
</span><span class="cx"> if ( $screenshot ) {
</span><del>- if ( 'absolute' == $uri )
- return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
- return $screenshot;
</del><ins>+ if ( 'relative' == $uri )
+ return $screenshot;
+ return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
</ins><span class="cx"> } elseif ( 0 === $screenshot ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx">
</span><span class="cx"> // This will set the screenshot cache.
</span><span class="cx"> // If there is no screenshot, the screenshot_count cache will also be set.
</span><del>- if ( ! $screenshot = $this->get_screenshot() )
</del><ins>+ if ( ! $screenshot = $this->get_screenshot( 'relative' ) )
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> $prefix = $this->get_stylesheet() . '/screenshot-';
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> if ( ! $count = $this->get_screenshot_count() )
</span><span class="cx"> return array();
</span><span class="cx">
</span><del>- $screenshots = array( $this->get_screenshot() );
</del><ins>+ $screenshots = array( $this->get_screenshot( 'relative' ) );
</ins><span class="cx"> for ( $i = 2; $i <= $count; $i++ )
</span><span class="cx"> $screenshots[] = 'screenshot-' . $i . '.png';
</span><span class="cx"> return $screenshots;
</span></span></pre></div>
<a id="trunkwpincludescustomizecontrolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/customize-controls.php (20042 => 20043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/customize-controls.php 2012-02-29 20:22:16 UTC (rev 20042)
+++ trunk/wp-includes/customize-controls.php 2012-02-29 20:31:56 UTC (rev 20043)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> do_action( 'customize_controls_enqueue_scripts' );
</span><span class="cx">
</span><span class="cx"> $theme = wp_get_theme();
</span><del>-$screenshot = $theme->get_screenshot( 'absolute' );
</del><ins>+$screenshot = $theme->get_screenshot();
</ins><span class="cx">
</span><span class="cx"> // Let's roll.
</span><span class="cx"> @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
</span></span></pre>
</div>
</div>
</body>
</html>