<!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>[20715] trunk: Pinking shears</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/20715">20715</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-03 16:41:59 +0000 (Thu, 03 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminindexphp">trunk/wp-admin/index.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpincludesclassphpmailerphp">trunk/wp-includes/class-phpmailer.php</a></li>
<li><a href="#trunkwpincludesclasssimplepiephp">trunk/wp-includes/class-simplepie.php</a></li>
<li><a href="#trunkwpincludesclasswpatomserverphp">trunk/wp-includes/class-wp-atom-server.php</a></li>
<li><a href="#trunkwpincludesclasswpthemephp">trunk/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
</span><span class="cx"> <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
</span><span class="cx"> </ul>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="categories-all" class="tabs-panel">
</span><span class="cx"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
</span><span class="cx"> <?php
</span><span class="lines">@@ -676,13 +676,13 @@
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="categories-pop" class="tabs-panel" style="display: none;">
</span><span class="cx"> <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
</span><span class="cx"> <?php wp_popular_terms_checklist('link_category'); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="category-adder" class="wp-hidden-children">
</span><span class="cx"> <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
</span><span class="cx"> <p id="link-category-add" class="wp-hidden-child">
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/includes/post.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -747,7 +747,7 @@
</span><span class="cx"> function _fix_attachment_links( $post_ID ) {
</span><span class="cx"> $post = & get_post( $post_ID, ARRAY_A );
</span><span class="cx"> $content = $post['post_content'];
</span><del>-
</del><ins>+
</ins><span class="cx"> // quick sanity check, don't run if no pretty permalinks or post is not published
</span><span class="cx"> if ( !get_option('permalink_structure') || $post['post_status'] != 'publish' )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/includes/screen.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $this->get_option( 'layout_columns' ) ) {
</span><span class="cx"> $this->columns = (int) get_user_option("screen_layout_$this->id");
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
</span><span class="cx"> $this->columns = $this->get_option( 'layout_columns', 'default' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/includes/update.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> if ( ! isset( $current->response ) )
</span><span class="cx"> return array();
</span><span class="cx">
</span><del>- $update_themes = array();
</del><ins>+ $update_themes = array();
</ins><span class="cx"> foreach ( $current->response as $stylesheet => $data ) {
</span><span class="cx"> $update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
</span><span class="cx"> $update_themes[ $stylesheet ]->update = $data;
</span></span></pre></div>
<a id="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/index.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> include (ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><span class="cx"> $today = current_time('mysql', 1);
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-admin/install.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
</span><del>- display_header();
</del><ins>+ display_header();
</ins><span class="cx"> die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclassphpmailerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-phpmailer.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-phpmailer.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/class-phpmailer.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -1643,7 +1643,7 @@
</span><span class="cx"> if (version_compare(PHP_VERSION, '5.3.0', '<')) {
</span><span class="cx"> set_magic_quotes_runtime(0);
</span><span class="cx"> } else {
</span><del>- ini_set('magic_quotes_runtime', 0);
</del><ins>+ ini_set('magic_quotes_runtime', 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $file_buffer = file_get_contents($path);
</span><span class="lines">@@ -1652,7 +1652,7 @@
</span><span class="cx"> if (version_compare(PHP_VERSION, '5.3.0', '<')) {
</span><span class="cx"> set_magic_quotes_runtime($magic_quotes);
</span><span class="cx"> } else {
</span><del>- ini_set('magic_quotes_runtime', $magic_quotes);
</del><ins>+ ini_set('magic_quotes_runtime', $magic_quotes);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return $file_buffer;
</span></span></pre></div>
<a id="trunkwpincludesclasssimplepiephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-simplepie.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-simplepie.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/class-simplepie.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -2775,7 +2775,7 @@
</span><span class="cx">
</span><span class="cx"> function get_latitude()
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
</span><span class="cx"> {
</span><span class="cx"> return (float) $return[0]['data'];
</span></span></pre></div>
<a id="trunkwpincludesclasswpatomserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-atom-server.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-atom-server.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/class-wp-atom-server.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -346,7 +346,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">@@ -355,7 +355,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="trunkwpincludesclasswpthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-theme.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-theme.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/class-wp-theme.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> * Method to implement ArrayAccess for keys formerly returned by get_themes().
</span><span class="cx"> *
</span><span class="cx"> * Author, Author Name, Author URI, and Description did not previously return
</span><del>- * translated data. We are doing so now as it is safe to do. However, as
</del><ins>+ * translated data. We are doing so now as it is safe to do. However, as
</ins><span class="cx"> * Name and Title could have been used as the key for get_themes(), both remain
</span><span class="cx"> * untranslated for back compatibility. This means that ['Name'] is not ideal,
</span><span class="cx"> * and care should be taken to use $theme->display('Name') to get a properly
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -3275,7 +3275,7 @@
</span><span class="cx"> $post_data = wp_get_single_post($post_ID, ARRAY_A);
</span><span class="cx"> if ( ! $post_data )
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid post ID.' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !current_user_can( 'edit_post', $post_ID ) )
</span><span class="cx"> return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/deprecated.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -2996,7 +2996,7 @@
</span><span class="cx"> */
</span><span class="cx"> function clean_pre($matches) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.4' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_array($matches) )
</span><span class="cx"> $text = $matches[1] . $matches[2] . "</pre>";
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (20714 => 20715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2012-05-03 15:59:50 UTC (rev 20714)
+++ trunk/wp-includes/functions.php 2012-05-03 16:41:59 UTC (rev 20715)
</span><span class="lines">@@ -3686,7 +3686,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> $ua = $_SERVER['HTTP_USER_AGENT'];
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( strpos($ua, 'iPhone') !== false
</span><span class="cx"> || strpos($ua, 'iPad') !== false
</span><span class="cx"> || strpos($ua, 'iPod') !== false ) {
</span></span></pre>
</div>
</div>
</body>
</html>