<!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>[20944] trunk: Shears of vigorous pinking.</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/20944">20944</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-27 16:25:43 +0000 (Sun, 27 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shears of vigorous pinking.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminaboutphp">trunk/wp-admin/about.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpadminjscustombackgrounddevjs">trunk/wp-admin/js/custom-background.dev.js</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/about.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/about.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-admin/about.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="changelog">
</span><span class="cx"> <h3><?php _e( 'Custom Headers' ); ?></h3>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="feature-section">
</span><span class="cx"> <h4><?php _e( 'Flexible Sizes' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'You can decide for yourself how tall or wide your custom header image should be. From now on, themes will provide a recommended image size for custom headers rather than a fixed requirement. Note: this feature requires <a href="http://codex.wordpress.org/Custom_Headers">theme support</a>.' ); ?></p>
</span><span class="lines">@@ -82,21 +82,21 @@
</span><span class="cx"> <div>
</span><span class="cx"> <h4><?php _e( 'Themes API' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'WP_Theme, wp_get_themes(), wp_get_theme(). Faster, uses less memory, makes use of persistent caching.' ); ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h4><?php _e( 'Faster Main Query' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'Post query optimized to avoid table scans.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="cx"> <h4><?php _e( 'Custom Header and Background API' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'Custom header and background API relocated into the theme support API.' ); ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h4><?php _e( 'Faster Translations' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'The number of strings loaded on the front end was greatly reduced, resulting in faster front page load times for localized installations.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="last-feature">
</span><span class="cx"> <h4><?php _e( 'WP_Screen API' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'More methods, more convenience!' ); ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h4><?php _e( 'External Libraries' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'jQuery, jQuery UI, TinyMCE, Plupload, PHPMailer, SimplePie, and other libraries were updated. jQuery UI Touch Punch was introduced.' ); ?></p>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-admin/custom-header.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> '<p>' . __( 'This screen is used to customize the header section of your theme.') . '</p>' .
</span><span class="cx"> '<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'set-header-image',
</span><span class="cx"> 'title' => __('Header Image'),
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> '<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
</span><span class="cx"> '<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'set-header-text',
</span><span class="cx"> 'title' => __('Header Text'),
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-admin/includes/image.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -440,12 +440,12 @@
</span><span class="cx"> */
</span><span class="cx"> function _copy_image_file( $attachment_id ) {
</span><span class="cx"> $dst_file = $src_file = get_attached_file( $attachment_id );
</span><del>- if ( ! file_exists( $src_file ) )
</del><ins>+ if ( ! file_exists( $src_file ) )
</ins><span class="cx"> $src_file = _load_image_to_edit_path( $attachment_id );
</span><span class="cx">
</span><span class="cx"> if ( $src_file ) {
</span><span class="cx"> $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
</span><del>- $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
</del><ins>+ $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
</ins><span class="cx"> if ( ! @copy( $src_file, $dst_file ) )
</span><span class="cx"> $dst_file = false;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminjscustombackgrounddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-background.dev.js (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-background.dev.js 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-admin/js/custom-background.dev.js 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -16,17 +16,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $(document).ready(function() {
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#pickcolor').click(function() {
</span><span class="cx"> $('#colorPickerDiv').show();
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#clearcolor a').click( function(e) {
</span><span class="cx"> pickColor( $('#defaultcolor').val(), true );
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#background-color').keyup(function() {
</span><span class="cx"> var _hex = $('#background-color').val(), hex = _hex;
</span><span class="cx"> if ( hex.charAt(0) != '#' )
</span><span class="lines">@@ -37,20 +37,20 @@
</span><span class="cx"> if ( hex.length == 4 || hex.length == 7 )
</span><span class="cx"> pickColor( hex );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('input[name="background-position-x"]').change(function() {
</span><span class="cx"> $('#custom-background-image').css('background-position', $(this).val() + ' top');
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('input[name="background-repeat"]').change(function() {
</span><span class="cx"> $('#custom-background-image').css('background-repeat', $(this).val());
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> farbtastic = $.farbtastic('#colorPickerDiv', function(color) {
</span><span class="cx"> pickColor(color);
</span><span class="cx"> });
</span><span class="cx"> pickColor($('#background-color').val());
</span><del>-
</del><ins>+
</ins><span class="cx"> $(document).mousedown(function(){
</span><span class="cx"> $('#colorPickerDiv').each(function(){
</span><span class="cx"> var display = $(this).css('display');
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-admin/theme-install.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> do_action('install_themes_pre_' . $tab); //Used to override the general interface, Eg, install or theme information.
</span><span class="cx">
</span><del>-$help_overview =
</del><ins>+$help_overview =
</ins><span class="cx"> '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'http://wordpress.org/extend/themes/') . '</p>' .
</span><span class="cx"> '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Newest, or Recently Updated. When you find a theme you like, you can preview it or install it.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-includes/formatting.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -2143,8 +2143,8 @@
</span><span class="cx"> $more = __( '&hellip;' );
</span><span class="cx"> $original_text = $text;
</span><span class="cx"> $text = wp_strip_all_tags( $text );
</span><del>- /* translators: If your word count is based on single characters (East Asian characters),
- enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
</del><ins>+ /* translators: If your word count is based on single characters (East Asian characters),
+ enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
</ins><span class="cx"> if ( 'characters' == _x( 'words', 'word count: words or characters?' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
</span><span class="cx"> $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
</span><span class="cx"> preg_match_all( '/./u', $text, $words_array );
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (20943 => 20944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-05-27 07:58:23 UTC (rev 20943)
+++ trunk/wp-includes/link-template.php 2012-05-27 16:25:43 UTC (rev 20944)
</span><span class="lines">@@ -2201,7 +2201,7 @@
</span><span class="cx"> * Set the scheme for a URL
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $url Absolute url that includes a scheme
</span><span class="cx"> * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
</span><span class="cx"> * @return string $url URL with chosen scheme.
</span></span></pre>
</div>
</div>
</body>
</html>