<!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>[18254] trunk: Bring out the 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://trac.wordpress.org/changeset/18254">18254</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-06-10 23:01:45 +0000 (Fri, 10 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring out the pinking shears.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssdashboardrtldevcss">trunk/wp-admin/css/dashboard-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssnavmenurtldevcss">trunk/wp-admin/css/nav-menu-rtl.dev.css</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunkwpadminjseditcommentsdevjs">trunk/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#trunkwpadminjsinlineeditpostdevjs">trunk/wp-admin/js/inline-edit-post.dev.js</a></li>
<li><a href="#trunkwpadminjsmediauploaddevjs">trunk/wp-admin/js/media-upload.dev.js</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesauthortemplatephp">trunk/wp-includes/author-template.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.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="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssdashboardrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/dashboard-rtl.dev.css (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/dashboard-rtl.dev.css 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/css/dashboard-rtl.dev.css 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> clear: left;
</span><span class="cx"> }
</span><span class="cx"> #dashboard_plugins .inside span {
</span><del>- padding-left: 0;
- padding-right: 5px;
</del><ins>+ padding-left: 0;
+ padding-right: 5px;
</ins><span class="cx"> }
</span><span class="cx"> #dashboard-widgets h3 .postbox-title-action {
</span><span class="cx"> right: auto;
</span></span></pre></div>
<a id="trunkwpadmincssnavmenurtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu-rtl.dev.css (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu-rtl.dev.css 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/css/nav-menu-rtl.dev.css 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> /* Button Secondary Actions */
</span><span class="cx"> .list-controls {
</span><del>- float: right;
</del><ins>+ float: right;
</ins><span class="cx"> }
</span><span class="cx"> .add-to-menu {
</span><span class="cx"> float: left;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> echo "<select name='action$two'>\n";
</span><span class="cx"> echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $this->_actions as $name => $title ) {
</span><span class="cx"> $class = 'edit' == $name ? ' class="hide-if-no-js"' : '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $actions = apply_filters( 'ms_user_row_actions', $actions, $user );
</del><ins>+ $actions = apply_filters( 'ms_user_row_actions', $actions, $user );
</ins><span class="cx"> echo $this->row_actions( $actions );
</span><span class="cx"> ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 'plural' => 'plugins',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get_table_classes() {
</span><span class="cx"> return array( 'widefat', $this->_args['plural'] );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/dashboard.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> array_unshift( $args, $widget_id );
</span><span class="cx"> ob_start();
</span><span class="cx"> call_user_func_array( $callback, $args );
</span><del>- set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds)
</del><ins>+ set_transient( $cache_key, ob_get_flush(), 43200); // Default lifetime in cache of 12 hours (same as the feeds)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/post.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -1581,7 +1581,7 @@
</span><span class="cx"> 'paste_text_use_dialog' => true,
</span><span class="cx"> 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
</span><span class="cx"> 'wpeditimage_disable_captions' => $no_captions,
</span><del>- 'wp_fullscreen_content_css' => "$baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
</del><ins>+ 'wp_fullscreen_content_css' => "$baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
</ins><span class="cx"> 'plugins' => implode( ',', $plugins ),
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1738,9 +1738,9 @@
</span><span class="cx">
</span><span class="cx"> function wp_quicktags() {
</span><span class="cx"> global $tinymce_version;
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_preload_dialogs( array( 'plugins' => 'wpdialogs,wplink,wpfullscreen' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !user_can_richedit() ) {
</span><span class="cx"> wp_enqueue_style( 'tinymce-buttons', includes_url('js/tinymce/themes/advanced/skins/wp_theme/ui.css'), array(), $tinymce_version );
</span><span class="cx"> wp_print_styles('tinymce-buttons');
</span><span class="lines">@@ -1793,7 +1793,7 @@
</span><span class="cx"> $buttons = apply_filters( 'wp_fullscreen_buttons', $buttons );
</span><span class="cx">
</span><span class="cx"> foreach ( $buttons as $button => $args ) {
</span><del>- if ( 'separator' == $args ) { ?>
</del><ins>+ if ( 'separator' == $args ) { ?>
</ins><span class="cx"> <div><span aria-orientation="vertical" role="separator" class="mceSeparator"></span></div>
</span><span class="cx"> <?php continue;
</span><span class="cx"> } ?>
</span></span></pre></div>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/includes/update-core.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> *
</span><span class="cx"> * The contents of this array indicate any new bundled plugins/themes which
</span><span class="cx"> * should be installed with the WordPress Upgrade. These items will not be
</span><del>- * re-installed in future upgrades, this behaviour is controlled by the
</del><ins>+ * re-installed in future upgrades, this behaviour is controlled by the
</ins><span class="cx"> * introduced version present here being older than the current installed version.
</span><span class="cx"> *
</span><span class="cx"> * The content of this array should follow the following format:
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.dev.js (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.dev.js 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/js/edit-comments.dev.js 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> if ( r.supplemental.parent_approved ) {
</span><span class="cx"> pid = $('#comment-' + r.supplemental.parent_approved);
</span><span class="cx"> updatePending( getCount( $('span.pending-count').eq(0) ) - 1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( this.comments_listing == 'moderated' ) {
</span><span class="cx"> pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){
</span><span class="cx"> pid.fadeOut();
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> $('#replyrow').after(c);
</span><span class="cx"> id = $(id);
</span><span class="cx"> t.addEvents(id);
</span><del>- bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat').css('backgroundColor');
</del><ins>+ bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat').css('backgroundColor');
</ins><span class="cx">
</span><span class="cx"> id.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
</span><span class="cx"> .animate( { 'backgroundColor': bg }, 300, function() {
</span></span></pre></div>
<a id="trunkwpadminjsinlineeditpostdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/inline-edit-post.dev.js (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/inline-edit-post.dev.js 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/js/inline-edit-post.dev.js 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> tax = 'post_tag';
</span><span class="cx"> $('tr.inline-editor textarea[name="tags_input"]').suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+tax, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
</span><span class="cx"> }
</span><del>- $('html, body').animate( { scrollTop: 0 }, 'fast' );
</del><ins>+ $('html, body').animate( { scrollTop: 0 }, 'fast' );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> edit : function(id) {
</span></span></pre></div>
<a id="trunkwpadminjsmediauploaddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.dev.js (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.dev.js 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/js/media-upload.dev.js 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> $(window).resize(function(){ tb_position(); });
</span><span class="cx">
</span><span class="cx"> // store caret position in IE
</span><del>- $(document).ready(function($){
- $('a.thickbox').click(function(){
</del><ins>+ $(document).ready(function($){
+ $('a.thickbox').click(function(){
</ins><span class="cx"> var ed;
</span><span class="cx">
</span><del>- if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
</del><ins>+ if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
</ins><span class="cx"> ed.focus();
</span><del>- ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
- }
- });
- });
</del><ins>+ ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
+ }
+ });
+ });
</ins><span class="cx">
</span><span class="cx"> })(jQuery);
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/menu.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
</span><span class="cx">
</span><span class="cx"> $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $submenu['plugins.php'][5] = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_multisite() ) {
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-admin/press-this.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="postdivrich">
</span><span class="cx"> <ul id="actions" class="actions">
</span><del>- <li><?php _e( 'Add:' ); ?></li>
</del><ins>+ <li><?php _e( 'Add:' ); ?></li>
</ins><span class="cx"> <li id="photo_button">
</span><span class="cx"> <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
</span><span class="cx"> <img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a>
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/admin-bar.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
</span><span class="cx"> $user_id = get_current_user_id();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 0 != $user_id ) {
</span><span class="cx"> if ( is_admin() )
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
</span><span class="cx"> $actions[ 'plugin-install.php' ] = array( _x( 'Plugin', 'add new from admin bar' ), 'install_plugins', 'new-plugin' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $actions ) )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesauthortemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/author-template.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/author-template.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/author-template.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -370,15 +370,15 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Does this site have more than one author
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Checks to see if more than one author has published posts.
</span><span class="cx"> *
</span><del>- * @since 3.2
</del><ins>+ * @since 3.2
</ins><span class="cx"> * @return bool Whether or not we have more than one author
</span><span class="cx"> */
</span><span class="cx"> function is_multi_author() {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( false === ( $is_multi_author = wp_cache_get('is_multi_author', 'posts') ) ) {
</span><span class="cx"> $rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
</span><span class="cx"> $is_multi_author = 1 < count( $rows ) ? 1 : 0;
</span><span class="lines">@@ -388,9 +388,9 @@
</span><span class="cx"> return (bool) $is_multi_author;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Helper function to clear the cache for number of authors.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @private
</span><span class="cx"> */
</span><span class="cx"> function __clear_multi_author_cache() {
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/canonical.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> } else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
</span><span class="cx"> foreach ( $qv_remove as $_qv ) {
</span><del>- if ( isset($rewrite_vars[$_qv]) )
</del><ins>+ if ( isset($rewrite_vars[$_qv]) )
</ins><span class="cx"> $redirect['query'] = remove_query_arg($_qv, $redirect['query']);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/class-http.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> 'filename' => null
</span><span class="cx"> );
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> // Pre-parse for the HEAD checks.
</span><span class="cx"> $args = wp_parse_args( $args );
</span><span class="cx">
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Tests which transports are capable of supporting the request.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.2.0
</span><span class="cx"> * @access private
</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 (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx"> * - 'post_id' - Default is ''. The post where the comment is posted. Empty string shows all comments.
</span><span class="cx"> * - 'number' - Default is 10. Total number of media items to retrieve.
</span><span class="cx"> * - 'offset' - Default is 0. See {@link WP_Query::query()} for more.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args Method parameters.
</span><span class="lines">@@ -1148,7 +1148,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Edit comment.
</span><span class="cx"> *
</span><del>- * Besides the common blog_id, username, and password arguments, it takes a
</del><ins>+ * Besides the common blog_id, username, and password arguments, it takes a
</ins><span class="cx"> * comment_id integer and a content_struct array as last argument.
</span><span class="cx"> *
</span><span class="cx"> * The allowed keys in the content_struct array are:
</span><span class="lines">@@ -1683,21 +1683,21 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'xmlrpc_call', 'wp.getPostFormats' );
</span><span class="cx">
</span><del>- $formats = get_post_format_strings();
</del><ins>+ $formats = get_post_format_strings();
</ins><span class="cx">
</span><del>- # find out if they want a list of currently supports formats
- if ( isset( $args[3] ) && is_array( $args[3] ) ) {
- if ( $args[3]['show-supported'] ) {
- if ( current_theme_supports( 'post-formats' ) ) {
- $supported = get_theme_support( 'post-formats' );
</del><ins>+ # find out if they want a list of currently supports formats
+ if ( isset( $args[3] ) && is_array( $args[3] ) ) {
+ if ( $args[3]['show-supported'] ) {
+ if ( current_theme_supports( 'post-formats' ) ) {
+ $supported = get_theme_support( 'post-formats' );
</ins><span class="cx">
</span><del>- $data['all'] = $formats;
- $data['supported'] = $supported[0];
</del><ins>+ $data['all'] = $formats;
+ $data['supported'] = $supported[0];
</ins><span class="cx">
</span><del>- $formats = $data;
- }
- }
- }
</del><ins>+ $formats = $data;
+ }
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> return $formats;
</span><span class="cx"> }
</span><span class="lines">@@ -2141,7 +2141,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Create a new post.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The 'content_struct' argument must contain:
</span><span class="cx"> * - title
</span><span class="cx"> * - description
</span><span class="lines">@@ -2150,7 +2150,7 @@
</span><span class="cx"> * - mt_keywords
</span><span class="cx"> * - mt_tb_ping_urls
</span><span class="cx"> * - categories
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Also, it can optionally contain:
</span><span class="cx"> * - wp_slug
</span><span class="cx"> * - wp_password
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/deprecated.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -2612,6 +2612,6 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_timezone_supported() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.2' );
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/link-template.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -1589,7 +1589,7 @@
</span><span class="cx"> $paged = 1;
</span><span class="cx">
</span><span class="cx"> $nextpage = intval($paged) + 1;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( null === $label )
</span><span class="cx"> $label = __( 'Next Page &raquo;' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/meta.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> * @since 3.2
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> public $relation;
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (18253 => 18254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-06-10 23:01:16 UTC (rev 18253)
+++ trunk/wp-includes/taxonomy.php 2011-06-10 23:01:45 UTC (rev 18254)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> * of term Y only if term X is the father of term Y, not its grandfather or great-grandfather, etc.
</span><span class="cx"> *
</span><span class="cx"> * The 'cache_domain' argument enables a unique cache key to be produced when this query is stored
</span><del>- * in object cache. For instance, if you are using one of this function's filters to modify the
</del><ins>+ * in object cache. For instance, if you are using one of this function's filters to modify the
</ins><span class="cx"> * query (such as 'terms_clauses'), setting 'cache_domain' to a unique value will not overwrite
</span><span class="cx"> * the cache for similar queries. Default value is 'core'.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>