<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16900] trunk: Pink trailing whites.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16900">16900</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-13 21:21:50 +0000 (Mon, 13 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pink trailing whites.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-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="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesinternallinkingphp">trunk/wp-admin/includes/internal-linking.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludescssadminbardevcss">trunk/wp-includes/css/admin-bar.dev.css</a></li>
<li><a href="#trunkwpincludescssjqueryuidialogdevcss">trunk/wp-includes/css/jquery-ui-dialog.dev.css</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesjswplistsdevjs">trunk/wp-includes/js/wp-lists.dev.js</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/admin-header.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -83,9 +83,9 @@
</span><span class="cx">
</span><span class="cx"> if ( get_user_setting('mfold') == 'f' )
</span><span class="cx"> $admin_body_class .= ' folded';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_admin_bar_showing() )
</span><del>- $admin_body_class .= ' admin-bar';
</del><ins>+ $admin_body_class .= ' admin-bar';
</ins><span class="cx">
</span><span class="cx"> if ( $is_iphone ) { ?>
</span><span class="cx"> <style type="text/css">.row-actions{visibility:visible;}</style>
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/edit-comments.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -135,11 +135,11 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php
</del><ins>+<h2><?php
</ins><span class="cx"> if ( $post_id )
</span><del>- echo sprintf(__('Comments on &#8220;%s&#8221;'),
- sprintf('<a href="%s">%s</a>',
- get_edit_post_link($post_id),
</del><ins>+ echo sprintf(__('Comments on &#8220;%s&#8221;'),
+ sprintf('<a href="%s">%s</a>',
+ get_edit_post_link($post_id),
</ins><span class="cx"> wp_html_excerpt(_draft_or_post_title($post_id), 50)
</span><span class="cx"> )
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/edit.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><del>-require_once( './admin.php' );
</del><ins>+require_once( './admin.php' );
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Posts_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx"> $pagenum = $wp_list_table->get_pagenum();
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/export.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><del>- jQuery(document).ready(function($){
</del><ins>+ jQuery(document).ready(function($){
</ins><span class="cx"> var form = $('#export-filters'),
</span><span class="cx"> filters = form.find('.export-filters');
</span><span class="cx"> filters.hide();
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> $orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
</span><span class="cx"> $order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
</span><span class="cx"> $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> 'moderated' => 'hold',
</span><span class="cx"> 'approved' => 'approve'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = array(
</span><span class="cx"> 'status' => isset( $status_map[$comment_status] ) ? $status_map[$comment_status] : $comment_status,
</span><span class="cx"> 'search' => $search,
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -516,12 +516,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Get a list of sortable columns. The format is:
</del><ins>+ * Get a list of sortable columns. The format is:
</ins><span class="cx"> * 'internal-name' => 'orderby'
</span><span class="cx"> * or
</span><span class="cx"> * 'internal-name' => array( 'orderby', true )
</span><span class="cx"> *
</span><del>- * The second format will make the initial sorting order be descending
</del><ins>+ * The second format will make the initial sorting order be descending
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access protected
</span><span class="lines">@@ -559,7 +559,7 @@
</span><span class="cx"> $data = (array) $data;
</span><span class="cx"> if ( !isset( $data[1] ) )
</span><span class="cx"> $data[1] = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $sortable[$id] = $data;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> <?php }
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> default:
</span><span class="cx"> echo "<td class='$column_name column-$column_name'$style>";
</span><span class="cx"> do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -160,8 +160,8 @@
</span><span class="cx"> $style = ' style="display:none;"';
</span><span class="cx">
</span><span class="cx"> $attributes = "$class$style";
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> switch ( $column_name ) {
</span><span class="cx"> case 'cb': ?>
</span><span class="cx"> <th scope="row" class="check-column">
</span><span class="lines">@@ -219,14 +219,14 @@
</span><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><span class="cx"> if ( !can_edit_network( $val->site_id ) )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> $path = ( $val->path == '/' ) ? '' : $val->path;
</span><span class="cx"> echo '<span class="site-' . $val->site_id . '" >';
</span><span class="cx"> echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</span><span class="cx"> echo ' <small class="row-actions">';
</span><span class="cx"> $actions = array();
</span><span class="cx"> $actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $class = '';
</span><span class="cx"> if ( get_blog_status( $val->userblog_id, 'spam' ) == 1 )
</span><span class="cx"> $class .= 'site-spammed ';
</span><span class="lines">@@ -236,11 +236,11 @@
</span><span class="cx"> $class .= 'site-deleted ';
</span><span class="cx"> if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
</span><span class="cx"> $class .= 'site-archived ';
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);
</span><del>-
</del><ins>+
</ins><span class="cx"> $i=0;
</span><span class="cx"> $action_count = count( $actions );
</span><span class="cx"> foreach ( $actions as $action => $link ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> $args['post_type'] = $post_type;
</span><span class="cx">
</span><del>- return "<a href='" . add_query_arg( $args, 'edit.php' ) . "'>$count</a>";
</del><ins>+ return "<a href='" . add_query_arg( $args, 'edit.php' ) . "'>$count</a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function column_links( $tag ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -7,10 +7,10 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> class WP_Users_List_Table extends WP_List_Table {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $site_id;
</span><span class="cx"> var $is_site_users;
</span><del>-
</del><ins>+
</ins><span class="cx"> function WP_Users_List_Table() {
</span><span class="cx"> $screen = get_current_screen();
</span><span class="cx"> $this->is_site_users = 'site-users-network' == $screen->id;
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> 'role' => $role,
</span><span class="cx"> 'search' => $usersearch
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> $args['blog_id'] = $this->site_id;
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> global $wp_roles, $role;
</span><span class="cx">
</span><span class="cx"> if ( $this->is_site_users ) {
</span><del>- $url = 'site-users.php?id=' . $this->site_id;
</del><ins>+ $url = 'site-users.php?id=' . $this->site_id;
</ins><span class="cx"> switch_to_blog( $this->site_id );
</span><span class="cx"> $users_of_blog = count_users();
</span><span class="cx"> restore_current_blog();
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> unset( $c['posts'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $c;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> 'email' => 'email',
</span><span class="cx"> 'posts' => 'post_count',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> unset( $c['posts'] );
</span><span class="cx">
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> $user_object = new WP_User( (int) $user_object );
</span><span class="cx"> $user_object = sanitize_user_object( $user_object, 'display' );
</span><span class="cx"> $email = $user_object->user_email;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $this->is_site_users )
</span><span class="cx"> $url = "site-users.php?id={$this->site_id}&amp;";
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/dashboard.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -144,9 +144,9 @@
</span><span class="cx"> if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
</span><span class="cx"> list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
</span><span class="cx"> $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
</span><del>- $callback = '_wp_dashboard_control_callback';
- } else {
- list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
</del><ins>+ $callback = '_wp_dashboard_control_callback';
+ } else {
+ list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
</ins><span class="cx"> $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesinternallinkingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/internal-linking.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/internal-linking.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/internal-linking.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -117,6 +117,6 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </form>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/media.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -1458,9 +1458,9 @@
</span><span class="cx">
</span><span class="cx"> do_action('pre-upload-ui');
</span><span class="cx">
</span><del>-if ( $flash ) :
</del><ins>+if ( $flash ) :
</ins><span class="cx">
</span><del>-// Set the post params, which SWFUpload will post back with the file, and pass
</del><ins>+// Set the post params, which SWFUpload will post back with the file, and pass
</ins><span class="cx"> // them through a filter.
</span><span class="cx"> $post_params = array(
</span><span class="cx"> "post_id" => $post_id,
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/ms.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -721,20 +721,20 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Whether or not we can edit this network from this page
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * By default editing of network is restricted to the Network Admin for that site_id this allows for this to be overridden
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @param integer $site_id The network/site id to check.
</span><span class="cx"> */
</span><span class="cx"> function can_edit_network( $site_id ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($site_id == $wpdb->siteid )
</span><span class="cx"> $result = true;
</span><span class="cx"> else
</span><span class="cx"> $result = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'can_edit_network', $result, $site_id );
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/includes/template.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
</span><span class="cx"> if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> // If a core box was previously added or removed by a plugin, don't add.
</span><span class="cx"> if ( 'core' == $priority ) {
</span><span class="cx"> // If core box previously deleted, don't add
</span><span class="lines">@@ -1538,7 +1538,7 @@
</span><span class="cx"> show_admin_bar( false );
</span><span class="cx"> global $hook_suffix, $current_screen, $current_user, $admin_body_class, $wp_locale;
</span><span class="cx"> $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
</span><del>-
</del><ins>+
</ins><span class="cx"> ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/js/common.dev.js 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -45,13 +45,13 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><del>- toggle : function(el) {
</del><ins>+ toggle : function(el) {
</ins><span class="cx"> el.slideToggle(150, function() {
</span><del>- var id = el.parent().toggleClass( 'wp-menu-open' ).attr('id');
</del><ins>+ var id = el.parent().toggleClass( 'wp-menu-open' ).attr('id');
</ins><span class="cx"> if ( id ) {
</span><span class="cx"> $('li.wp-has-submenu', '#adminmenu').each(function(i, e) {
</span><span class="cx"> if ( id == e.id ) {
</span><del>- var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
</del><ins>+ var v = $(e).hasClass('wp-menu-open') ? 'o' : 'c';
</ins><span class="cx"> setUserSetting( 'm'+i, v );
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/js/theme.dev.js 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> $( '#filter-box' ).slideToggle();
</span><span class="cx"> $( '#current-theme' ).slideToggle( 300 );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/network.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> if ( defined( $c ) )
</span><span class="cx"> unset( $keys_salts[ $c ] );
</span><span class="cx"> }
</span><del>- if ( ! empty( $keys_salts ) ) {
</del><ins>+ if ( ! empty( $keys_salts ) ) {
</ins><span class="cx"> $keys_salts_str = '';
</span><span class="cx"> $from_api = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
</span><span class="cx"> if ( is_wp_error( $from_api ) ) {
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/plugin-install.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx"> if ( ! current_user_can('install_plugins') )
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() && ! is_network_admin() ) {
</span><span class="cx"> wp_redirect( network_admin_url( 'plugin-install.php' ) );
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/plugins.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('activate_plugins') )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage plugins for this site.' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Plugins_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/press-this.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">
</span><span class="cx"> if ( user_can_richedit() ) {
</span><span class="cx"> wp_tiny_mce( true, array( 'height' => '370' ) );
</span><del>- wp_tiny_mce_preload_dialogs();
</del><ins>+ wp_tiny_mce_preload_dialogs();
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/theme-install.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
</span><span class="cx"> define( 'IFRAME_REQUEST', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx"> if ( ! current_user_can('install_themes') )
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-admin/themes.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx"> if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Themes_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/category-template.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> $categories = get_the_terms( $id, 'category' );
</span><span class="cx"> if ( ! $categories )
</span><span class="cx"> $categories = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> $categories = array_values( $categories );
</span><span class="cx">
</span><span class="cx"> foreach ( array_keys( $categories ) as $key ) {
</span><span class="lines">@@ -1073,7 +1073,7 @@
</span><span class="cx"> $terms = wp_get_object_terms( $id, $taxonomy );
</span><span class="cx"> wp_cache_add($id, $terms, $taxonomy . '_relationships');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $terms = apply_filters( 'get_the_terms', $terms, $id, $taxonomy );
</span><span class="cx">
</span><span class="cx"> if ( empty( $terms ) )
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/class-wp-admin-bar.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -179,13 +179,13 @@
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !is_network_admin() && !is_user_admin() ) {
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 );
</span><span class="cx"> add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 60 );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'add_admin_bar_menus' );
</span><span class="cx"> }
</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 (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_comment', $comment_ID ) )
</span><span class="cx"> return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('xmlrpc_call', 'wp.deleteComment');
</span><span class="cx">
</span><span class="cx"> if ( ! get_comment($comment_ID) )
</span><span class="lines">@@ -1135,7 +1135,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( 'edit_comment', $comment_ID ) )
</span><span class="cx"> return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('xmlrpc_call', 'wp.editComment');
</span><span class="cx">
</span><span class="cx"> if ( ! get_comment($comment_ID) )
</span><span class="lines">@@ -1608,18 +1608,18 @@
</span><span class="cx">
</span><span class="cx"> return $attachments_struct;
</span><span class="cx"> }
</span><del>-
- /**
- * Retrives a list of post formats used by the site
- *
</del><ins>+
+ /**
+ * Retrives a list of post formats used by the site
+ *
</ins><span class="cx"> * @since 3.1
</span><del>- *
- * @param array $args Method parameters. Contains:
- * - blog_id
- * - username
- * - password
- * @return array
- */
</del><ins>+ *
+ * @param array $args Method parameters. Contains:
+ * - blog_id
+ * - username
+ * - password
+ * @return array
+ */
</ins><span class="cx"> function wp_getPostFormats( $args ) {
</span><span class="cx"> $this->escape( $args );
</span><span class="cx">
</span><span class="lines">@@ -1629,10 +1629,10 @@
</span><span class="cx">
</span><span class="cx"> if ( !$user = $this->login( $username, $password ) )
</span><span class="cx"> return $this->error;
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'xmlrpc_call', 'wp.getPostFormats' );
</span><span class="cx"> return get_post_format_strings();
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> /* Blogger API functions.
</span><span class="cx"> * specs on http://plant.blogger.com/api and http://groups.yahoo.com/group/bloggerDev/
</span><span class="lines">@@ -2092,7 +2092,7 @@
</span><span class="cx"> return $this->error;
</span><span class="cx">
</span><span class="cx"> do_action('xmlrpc_call', 'metaWeblog.newPost');
</span><del>-
</del><ins>+
</ins><span class="cx"> $page_template = '';
</span><span class="cx"> if ( !empty( $content_struct['post_type'] ) ) {
</span><span class="cx"> if ( $content_struct['post_type'] == 'page' ) {
</span><span class="lines">@@ -2127,15 +2127,15 @@
</span><span class="cx"> else
</span><span class="cx"> $cap = 'edit_posts';
</span><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
</span><del>- $post_type = 'post';
</del><ins>+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="cx"> return new IXR_Error( 401, $error_message );
</span><span class="cx">
</span><span class="cx"> // Check for a valid post format if one was given
</span><del>- if ( isset( $content_struct['wp_post_format'] ) ) {
- $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
</del><ins>+ if ( isset( $content_struct['wp_post_format'] ) ) {
+ $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
</ins><span class="cx"> if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid post format' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -2330,11 +2330,11 @@
</span><span class="cx"> $this->add_enclosure_if_new($post_ID, $thisEnclosure);
</span><span class="cx">
</span><span class="cx"> $this->attach_uploads( $post_ID, $post_content );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Handle post formats if assigned, value is validated earlier
</span><span class="cx"> // in this function
</span><span class="cx"> if ( isset( $content_struct['wp_post_format'] ) )
</span><del>- wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
</del><ins>+ wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
</ins><span class="cx">
</span><span class="cx"> logIO('O', "Posted ! ID: $post_ID");
</span><span class="cx">
</span><span class="lines">@@ -2436,15 +2436,15 @@
</span><span class="cx"> else
</span><span class="cx"> $cap = 'edit_posts';
</span><span class="cx"> $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
</span><del>- $post_type = 'post';
</del><ins>+ $post_type = 'post';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can( $cap ) )
</span><span class="cx"> return new IXR_Error( 401, $error_message );
</span><span class="cx">
</span><span class="cx"> // Check for a valid post format if one was given
</span><del>- if ( isset( $content_struct['wp_post_format'] ) ) {
- $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
</del><ins>+ if ( isset( $content_struct['wp_post_format'] ) ) {
+ $content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
</ins><span class="cx"> if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
</span><span class="cx"> return new IXR_Error( 404, __( 'Invalid post format' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -2649,11 +2649,11 @@
</span><span class="cx"> $this->add_enclosure_if_new($post_ID, $thisEnclosure);
</span><span class="cx">
</span><span class="cx"> $this->attach_uploads( $ID, $post_content );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Handle post formats if assigned, validation is handled
</span><span class="cx"> // earlier in this function
</span><span class="cx"> if ( isset( $content_struct['wp_post_format'] ) )
</span><del>- wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
</del><ins>+ wp_set_post_terms( $post_ID, array( 'post-format-' . $content_struct['wp_post_format'] ), 'post_format' );
</ins><span class="cx">
</span><span class="cx"> logIO('O',"(MW) Edited ! ID: $post_ID");
</span><span class="cx">
</span><span class="lines">@@ -2721,8 +2721,8 @@
</span><span class="cx"> // Consider future posts as published
</span><span class="cx"> if ( $postdata['post_status'] === 'future' )
</span><span class="cx"> $postdata['post_status'] = 'publish';
</span><del>-
- // Get post format
</del><ins>+
+ // Get post format
</ins><span class="cx"> $post_format = get_post_format( $post_ID );
</span><span class="cx"> if ( empty( $post_format ) )
</span><span class="cx"> $post_format = 'standard';
</span><span class="lines">@@ -2848,8 +2848,8 @@
</span><span class="cx"> // Consider future posts as published
</span><span class="cx"> if ( $entry['post_status'] === 'future' )
</span><span class="cx"> $entry['post_status'] = 'publish';
</span><del>-
- // Get post format
</del><ins>+
+ // Get post format
</ins><span class="cx"> $post_format = get_post_format( $entry['ID'] );
</span><span class="cx"> if ( empty( $post_format ) )
</span><span class="cx"> $post_format = 'standard';
</span></span></pre></div>
<a id="trunkwpincludescssadminbardevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/admin-bar.dev.css (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/admin-bar.dev.css 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/css/admin-bar.dev.css 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wpadminbar ul,
</del><ins>+#wpadminbar ul,
</ins><span class="cx"> #wpadminbar ul li {
</span><span class="cx"> background: none;
</span><span class="cx"> list-style: none;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> #wpadminbar .quicklinks li:hover {
</span><span class="cx"> background: #555;
</span><span class="cx"> background: -moz-linear-gradient(bottom, #555, #3e3e3e);
</span><del>- background: -webkit-gradient(linear, left bottom, left top, from(#555), to(#3e3e3e));
</del><ins>+ background: -webkit-gradient(linear, left bottom, left top, from(#555), to(#3e3e3e));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wpadminbar .quicklinks .menupop li:hover {
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> text-shadow: 0px 1px 0px #eee;
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> float: left;
</span><del>- background: #aaa;
</del><ins>+ background: #aaa;
</ins><span class="cx"> background: -moz-linear-gradient(bottom, #aaa, #cecece);
</span><span class="cx"> background: -webkit-gradient(linear, left bottom, left top, from(#aaa), to(#cecece));
</span><span class="cx"> -webkit-border-radius: 10px;
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wpadminbar #adminbarsearch .adminbar-button:active {
</span><del>- background: #a0a0a0;
</del><ins>+ background: #a0a0a0;
</ins><span class="cx"> background:-moz-linear-gradient(bottom, #a0a0a0, #c1c1c1);
</span><span class="cx"> background:-webkit-gradient(linear, left bottom, left top, from(#a0a0a0), to(#c1c1c1));
</span><span class="cx"> -moz-box-shadow: inset 1px 1px 1px #9b9b9b;
</span></span></pre></div>
<a id="trunkwpincludescssjqueryuidialogdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/jquery-ui-dialog.dev.css (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/jquery-ui-dialog.dev.css 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/css/jquery-ui-dialog.dev.css 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> * http://docs.jquery.com/UI/Dialog#theming
</span><span class="cx"> */
</span><span class="cx"> .wp-dialog { position: absolute; width: 300px; overflow: hidden; }
</span><del>-.wp-dialog .ui-dialog-titlebar { position: relative; }
</del><ins>+.wp-dialog .ui-dialog-titlebar { position: relative; }
</ins><span class="cx"> .wp-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
</span><span class="cx"> .wp-dialog .ui-dialog-content { position: relative; border: 0; padding: 0; background: none; overflow: auto; zoom: 1; }
</span><span class="cx"> .wp-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/functions.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -4196,7 +4196,7 @@
</span><span class="cx"> * Searches for metadata in the first 8kiB of a file, such as a plugin or theme.
</span><span class="cx"> * Each piece of metadata must be on its own line. Fields can not span multple
</span><span class="cx"> * lines, the value will get cut at the end of the first line.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * If the file data is not within that first 8kiB, then the author should correct
</span><span class="cx"> * their plugin file and move the data headers to the top.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesjswplistsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-lists.dev.js (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-lists.dev.js 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/js/wp-lists.dev.js 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -324,8 +324,8 @@
</span><span class="cx"> var list = this,
</span><span class="cx"> $el = $(el || document);
</span><span class="cx">
</span><del>- $el.delegate( "form[class^=add:" + list.id + ":]", 'submit', function(){
- return list.wpList.add(this);
</del><ins>+ $el.delegate( "form[class^=add:" + list.id + ":]", 'submit', function(){
+ return list.wpList.add(this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $el.delegate( "[class^=add:" + list.id + ":]:not(form)", 'click', function(){
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $el.delegate( "[class^=delete:" + list.id + ":]", 'click', function(){
</span><del>- return list.wpList.del(this);
</del><ins>+ return list.wpList.del(this);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $el.delegate( "[class^=dim:" + list.id + ":]", 'click', function(){
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/ms-blogs.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -671,10 +671,10 @@
</span><span class="cx"> */
</span><span class="cx"> function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty( $deprecated ) )
</span><span class="cx"> _deprecated_argument( __FUNCTION__, 'MU' ); // never used
</span><del>-
</del><ins>+
</ins><span class="cx"> return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/post.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -2318,7 +2318,7 @@
</span><span class="cx">
</span><span class="cx"> $post = get_post($postid, $mode);
</span><span class="cx">
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> ( OBJECT == $mode && empty( $post->ID ) ) ||
</span><span class="cx"> ( OBJECT != $mode && empty( $post['ID'] ) )
</span><span class="cx"> )
</span><span class="lines">@@ -3827,7 +3827,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'attachment' != $post->post_type || empty( $url ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $url;
</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 (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/taxonomy.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> $query = array_merge( $defaults, $query );
</span><span class="cx">
</span><span class="cx"> $query['terms'] = (array) $query['terms'];
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->queries[] = $query;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> * @param array &$terms The list of terms
</span><span class="cx"> * @param string $taxonomy The taxonomy of the terms
</span><span class="cx"> * @param string $field The initial field
</span><del>- * @param string $resulting_field The resulting field
</del><ins>+ * @param string $resulting_field The resulting field
</ins><span class="cx"> */
</span><span class="cx"> function _transform_terms( &$terms, $taxonomy, $field, $resulting_field ) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -1582,8 +1582,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Will unlink the object from the taxonomy or taxonomies.
</span><span class="cx"> *
</span><del>- * Will remove all relationships between the object and any terms in
- * a particular taxonomy or taxonomies. Does not remove the term or
</del><ins>+ * Will remove all relationships between the object and any terms in
+ * a particular taxonomy or taxonomies. Does not remove the term or
</ins><span class="cx"> * taxonomy itself.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -1697,8 +1697,8 @@
</span><span class="cx"> // Clean the relationship caches for all object types using this term
</span><span class="cx"> $tax_object = get_taxonomy( $taxonomy );
</span><span class="cx"> foreach ( $tax_object->object_type as $object_type )
</span><del>- clean_object_term_cache( $objects, $object_type );
-
</del><ins>+ clean_object_term_cache( $objects, $object_type );
+
</ins><span class="cx"> do_action( 'delete_term_taxonomy', $tt_id );
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $tt_id ) );
</span><span class="cx"> do_action( 'deleted_term_taxonomy', $tt_id );
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-includes/theme.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -1479,7 +1479,7 @@
</span><span class="cx"> function remove_custom_image_header() {
</span><span class="cx"> if ( ! current_theme_supports( 'custom-header' ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $callback = get_theme_support( 'custom-header' );
</span><span class="cx"> remove_action( 'wp_head', $callback[0]['callback'] );
</span><span class="cx"> _remove_theme_support( 'custom-header' );
</span><span class="lines">@@ -1619,7 +1619,7 @@
</span><span class="cx"> function remove_custom_background() {
</span><span class="cx"> if ( ! current_theme_supports( 'custom-background' ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $callback = get_theme_support( 'custom-background' );
</span><span class="cx"> remove_action( 'wp_head', $callback[0]['callback'] );
</span><span class="cx"> _remove_theme_support( 'custom-background' );
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (16899 => 16900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-12-13 21:03:34 UTC (rev 16899)
+++ trunk/wp-login.php 2010-12-13 21:21:50 UTC (rev 16900)
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> <?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
</span><span class="cx"> if( d.value != '' )
</span><span class="cx"> d.value = '';
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> }
</span><span class="cx"> }?>
</span><span class="cx"> d.focus();
</span></span></pre>
</div>
</div>
</body>
</html>