<!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>[20000] trunk: Pinking shears 6-20000</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/20000">20000</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-02-27 19:46:52 +0000 (Mon, 27 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears 6-20000</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
<li><a href="#trunkwpadminjsutilsdevjs">trunk/wp-admin/js/utils.dev.js</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizesettingphp">trunk/wp-includes/class-wp-customize-setting.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesclasswpscriptsphp">trunk/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-admin/js/theme.dev.js 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $('.tablenav-pages').length )
</span><span class="cx"> this.pollInterval =
</span><del>- setInterval( function() {
</del><ins>+ setInterval( function() {
</ins><span class="cx"> return self.poll();
</span><span class="cx"> }, this.scrollPollingDelay );
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkwpadminjsutilsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/utils.dev.js (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/utils.dev.js 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-admin/js/utils.dev.js 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Get a multi-values cookie.
</span><span class="cx"> * Returns a JS object with the name: 'value' pairs.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> getHash : function(name) {
</span><span class="cx"> var all = this.get(name), ret;
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> * Set a multi-values cookie.
</span><span class="cx"> *
</span><span class="cx"> * 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set().
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> setHash : function(name, values_obj, expires, path, domain, secure) {
</span><span class="cx"> var str = '';
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get a cookie.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> get : function(name) {
</span><span class="cx"> var cookie = document.cookie, e, p = name + "=", b;
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> *
</span><span class="cx"> * The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat)
</span><span class="cx"> * or the number of seconds until expiration
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> set : function(name, value, expires, path, domain, secure) {
</span><span class="cx"> var d = new Date();
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> * Remove a cookie.
</span><span class="cx"> *
</span><span class="cx"> * This is done by setting it to an empty value and setting the expiration time in the past.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> remove : function(name, path) {
</span><span class="cx"> this.set(name, '', -1000, path);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-app.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> $post_content = '';
</span><span class="cx"> $post_excerpt = '';
</span><span class="cx"> $pubtimes = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
</span><span class="cx"> $post_title = (string) $entry->title[1];
</span><span class="cx"> if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> $post_excerpt = (string) $entry->summary[1];
</span><span class="cx"> if ( !empty( $entry->published ) )
</span><span class="cx"> $pubtimes = (string) $entry->published;
</span><del>-
</del><ins>+
</ins><span class="cx"> $pubtimes = $this->get_publish_time( $pubtimes );
</span><span class="cx">
</span><span class="cx"> $post_date = $pubtimes[0];
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizesettingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-setting.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-setting.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/class-wp-customize-setting.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> * @subpackage Customize
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> class WP_Customize_Setting {
</span><span class="cx"> public $id;
</span><span class="cx"> public $priority = 10;
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> * Callback function to filter the theme mods and options.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param mixed Old value.
</span><span class="cx"> * @return mixed New or old value.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -637,8 +637,8 @@
</span><span class="cx"> return new IXR_Error( 403, __( 'Invalid post type' ) );
</span><span class="cx">
</span><span class="cx"> $update = false;
</span><del>- if ( ! empty( $post_data[ 'ID' ] ) )
- $update = true;
</del><ins>+ if ( ! empty( $post_data[ 'ID' ] ) )
+ $update = true;
</ins><span class="cx">
</span><span class="cx"> if ( $update ) {
</span><span class="cx"> if ( ! current_user_can( $post_type->cap->edit_post, $post_data[ 'ID' ] ) )
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> // Do some timestamp voodoo
</span><span class="cx"> if ( ! empty( $post_data['post_date_gmt'] ) ) {
</span><span class="cx"> // We know this is supposed to be GMT, so we're going to slap that Z on there by force
</span><del>- $dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z';
</del><ins>+ $dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z';
</ins><span class="cx"> } elseif ( ! empty( $post_data['post_date'] ) ) {
</span><span class="cx"> $dateCreated = $post_data['post_date']->getIso();
</span><span class="cx"> }
</span><span class="lines">@@ -3201,7 +3201,7 @@
</span><span class="cx"> $menu_order = $content_struct['wp_page_order'];
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
</span><del>- $page_template = $content_struct['wp_page_template'];
</del><ins>+ $page_template = $content_struct['wp_page_template'];
</ins><span class="cx">
</span><span class="cx"> $post_author = $postdata['post_author'];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-scripts.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-scripts.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/class.wp-scripts.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
</span><span class="cx"> $this->init();
</span><span class="cx"> else
</span><del>- add_action( 'init', array( $this, 'init' ), 0 );
</del><ins>+ add_action( 'init', array( $this, 'init' ), 0 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function init() {
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/comment.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -569,16 +569,16 @@
</span><span class="cx"> return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
- * to recall previous comments by this commentator that are still held in moderation.
- *
</del><ins>+/**
+ * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
+ * to recall previous comments by this commentator that are still held in moderation.
+ *
</ins><span class="cx"> * @param object $comment Comment object.
</span><span class="cx"> * @param object $user Comment author's object.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.4.0
</span><del>- */
-function wp_set_comment_cookies($comment, $user) {
</del><ins>+ */
+function wp_set_comment_cookies($comment, $user) {
</ins><span class="cx"> if ( $user->ID )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
</span><span class="cx"> setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
</span><span class="cx"> setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Sanitizes the cookies sent to the user already.
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/deprecated.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -2870,7 +2870,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Open the file handle for debugging.
</del><ins>+ * Open the file handle for debugging.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @deprecated Use error_log()
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/functions.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $format Format of the date to return.
</span><span class="cx"> * @param string $date Date string to convert.
</span><del>- * @param bool $translate Whether the return date should be translated. Default is true.
</del><ins>+ * @param bool $translate Whether the return date should be translated. Default is true.
</ins><span class="cx"> * @return string|int Formatted date string, or Unix timestamp.
</span><span class="cx"> */
</span><span class="cx"> function mysql2date( $format, $date, $translate = true ) {
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/link-template.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -1869,7 +1869,7 @@
</span><span class="cx"> $url = get_blog_option( $blog_id, 'home' );
</span><span class="cx">
</span><span class="cx"> if ( 'relative' == $scheme )
</span><del>- $url = preg_replace( '#^.+://[^/]*#', '', $url );
</del><ins>+ $url = preg_replace( '#^.+://[^/]*#', '', $url );
</ins><span class="cx"> elseif ( 'http' != $scheme )
</span><span class="cx"> $url = str_replace( 'http://', "$scheme://", $url );
</span><span class="cx">
</span><span class="lines">@@ -1934,7 +1934,7 @@
</span><span class="cx"> $url = get_blog_option( $blog_id, 'siteurl' );
</span><span class="cx">
</span><span class="cx"> if ( 'relative' == $scheme )
</span><del>- $url = preg_replace( '#^.+://[^/]*#', '', $url );
</del><ins>+ $url = preg_replace( '#^.+://[^/]*#', '', $url );
</ins><span class="cx"> elseif ( 'http' != $scheme )
</span><span class="cx"> $url = str_replace( 'http://', "{$scheme}://", $url );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/rewrite.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> * would have a set of rules added to the top of the rewrite rules array.
</span><span class="cx"> * Now it tells {@link WP::parse_request()} to check if a URL matching the
</span><span class="cx"> * page permastruct is actually a page before accepting it.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @link http://core.trac.wordpress.org/ticket/16687
</span><span class="cx"> * @see WP_Rewrite::init()
</span><span class="cx"> * @since 2.5.0
</span></span></pre></div>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (19999 => 20000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php 2012-02-27 19:23:03 UTC (rev 19999)
+++ trunk/wp-includes/update.php 2012-02-27 19:46:52 UTC (rev 20000)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> default :
</span><span class="cx"> $timeout = 43200; // 12 hours
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
</span><span class="cx">
</span><span class="cx"> if ( $time_not_changed ) {
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> default :
</span><span class="cx"> $timeout = 43200; // 12 hours
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
</span><span class="cx">
</span><span class="cx"> if ( $time_not_changed ) {
</span></span></pre>
</div>
</div>
</body>
</html>