<!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>[16438] trunk: Pinking shears</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16438">16438</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-17 18:47:34 +0000 (Wed, 17 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincsscolorsclassicdevcss">trunk/wp-admin/css/colors-classic.dev.css</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-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="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludeslisttablephp">trunk/wp-admin/includes/list-table.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminjslisttabledevjs">trunk/wp-admin/js/list-table.dev.js</a></li>
<li><a href="#trunkwpadminmediaphp">trunk/wp-admin/media.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswphttpixrclientphp">trunk/wp-includes/class-wp-http-ixr-client.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesclasswpscriptsphp">trunk/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludesmsadminbarphp">trunk/wp-includes/ms-admin-bar.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/admin-ajax.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -723,13 +723,13 @@
</span><span class="cx">
</span><span class="cx"> require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
</span><span class="cx">
</span><del>- // For performance reasons, we omit some object properties from the checklist.
</del><ins>+ // For performance reasons, we omit some object properties from the checklist.
</ins><span class="cx"> // The following is a hacky way to restore them when adding non-custom items.
</span><span class="cx">
</span><span class="cx"> $menu_items_data = array();
</span><span class="cx"> foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
</span><span class="cx"> if (
</span><del>- ! empty( $menu_item_data['menu-item-type'] ) &&
</del><ins>+ ! empty( $menu_item_data['menu-item-type'] ) &&
</ins><span class="cx"> 'custom' != $menu_item_data['menu-item-type'] &&
</span><span class="cx"> ! empty( $menu_item_data['menu-item-object-id'] )
</span><span class="cx"> ) {
</span><span class="lines">@@ -739,19 +739,19 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'taxonomy' :
</span><del>- $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
</del><ins>+ $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
</del><ins>+ $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
</ins><span class="cx"> $_menu_item = array_shift( $_menu_items );
</span><span class="cx">
</span><span class="cx"> // Restore the missing menu item properties
</span><span class="cx"> $menu_item_data['menu-item-description'] = $_menu_item->description;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_items_data[] = $menu_item_data;
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
</span><span class="cx"> if ( is_wp_error( $item_ids ) )
</span><span class="lines">@@ -1077,7 +1077,7 @@
</span><span class="cx"> require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link-includes.php';
</span><span class="cx">
</span><span class="cx"> wp_link_ajax( $_POST );
</span><del>-
</del><ins>+
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'menu-locations-save':
</span></span></pre></div>
<a id="trunkwpadmincsscolorsclassicdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.dev.css (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.dev.css 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/css/colors-classic.dev.css 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -1126,8 +1126,8 @@
</span><span class="cx">
</span><span class="cx"> .folded #adminmenu li.wp-has-current-submenu,
</span><span class="cx"> .folded #adminmenu li.menu-top.current {
</span><del>- background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x;
- border: #5589aa 1px solid;
</del><ins>+ background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x;
+ border: #5589aa 1px solid;
</ins><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/edit-comments.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx"> if ( !current_user_can('edit_posts') )
</span><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Comments_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/edit-tags.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> $tax = get_taxonomy( $taxnow );
</span><span class="cx"> if ( !current_user_can( $tax->cap->manage_terms ) )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Terms_List_Table');
</span><span class="cx"> $wp_list_table->check_permissions();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $this->detached ) {
</span><span class="cx"> submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
</span><del>- } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
</del><ins>+ } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
</ins><span class="cx"> submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
</span><span class="cx"> } ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> echo "<tr class='$class'>";
</span><span class="cx">
</span><span class="cx"> $blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
</span><del>-
</del><ins>+
</ins><span class="cx"> list( $columns, $hidden ) = $this->get_column_info();
</span><span class="cx">
</span><span class="cx"> foreach ( $columns as $column_name => $column_display_name ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> class WP_MS_Themes_List_Table extends WP_List_Table {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $site_id;
</span><span class="cx"> var $is_site_themes;
</span><span class="cx">
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 'plural' => 'plugins', // @todo replace with themes and add css
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function check_permissions() {
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $menu_perms = get_site_option( 'menu_items', array() );
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->is_site_themes && !current_user_can('manage_sites') )
- wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
- else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') )
</del><ins>+ if ( $this->is_site_themes && !current_user_can('manage_sites') )
+ wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+ else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') )
</ins><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> 'upgrade' => array()
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $site_allowed_themes = get_site_allowed_themes();
</del><ins>+ $site_allowed_themes = get_site_allowed_themes();
</ins><span class="cx"> if ( !$this->is_site_themes ) {
</span><span class="cx"> $allowed_themes = $site_allowed_themes;
</span><span class="cx"> $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> $allowed_themes = wpmu_get_blog_allowedthemes( $this->site_id );
</span><span class="cx"> $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $current = get_site_transient( 'update_themes' );
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $themes['all'] as $key => $theme ) {
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> if ( isset( $current->response[ $theme['Template'] ] ) )
</span><span class="cx"> $themes['upgrade'][$key] = $themes['all'][$key];
</span><span class="cx">
</span><del>- if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) {
- unset( $themes['all'][$key] );
- unset( $themes['enabled'][$key] );
- unset( $themes['disabled'][$key] );
</del><ins>+ if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) {
+ unset( $themes['all'][$key] );
+ unset( $themes['enabled'][$key] );
+ unset( $themes['disabled'][$key] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> 'per_page' => $themes_per_page,
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function _search_callback( $theme ) {
</span><span class="cx"> static $term;
</span><span class="cx"> if ( is_null( $term ) )
</span><span class="lines">@@ -211,9 +211,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $this->is_site_themes )
- $url = 'site-themes.php?id=' . $this->site_id;
- else
</del><ins>+ if ( $this->is_site_themes )
+ $url = 'site-themes.php?id=' . $this->site_id;
+ else
</ins><span class="cx"> $url = 'themes.php';
</span><span class="cx">
</span><span class="cx"> $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> $actions['disable-selected'] = __( 'Disable' );
</span><span class="cx"> if ( current_user_can( 'update_themes' ) )
</span><span class="cx"> $actions['update-selected'] = __( 'Update' );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $actions;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -332,8 +332,8 @@
</span><span class="cx"> echo implode( ' | ', $theme_meta );
</span><span class="cx">
</span><span class="cx"> echo "</div></td>";
</span><del>- break;
</del><span class="cx"> break;
</span><ins>+ break;
</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_themes_custom_column', $column_name, $theme_key, $theme );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> $screen = get_current_screen();
</span><span class="cx">
</span><span class="cx"> if ( 'active' != $status ) {
</span><del>- $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
</del><ins>+ $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
</ins><span class="cx"> $actions[ $action ] = __( 'Activate' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( ! empty( $plugin_data['PluginURI'] ) )
</span><span class="cx"> $plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
</span><span class="cx"> echo implode( ' | ', $plugin_meta );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> ?>
</span><del>- <td <?php echo $attributes ?>><?php
</del><ins>+ <td <?php echo $attributes ?>><?php
</ins><span class="cx"> if ( 'page' == $post->post_type )
</span><span class="cx"> do_action( 'manage_pages_custom_column', $column_name, $post->ID );
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/dashboard.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
</span><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><del>-
</del><ins>+
</ins><span class="cx"> if ( is_blog_admin () )
</span><span class="cx"> $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
</span><span class="cx"> else if (is_network_admin() )
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx">
</span><span class="cx"> $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
</span><span class="cx"> $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
</span><span class="cx">
</span><span class="cx"> if ( $actions ) {
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/file.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @uses get_home_path
</del><ins>+ * @uses get_home_path
</ins><span class="cx"> * @uses WP_CONTENT_DIR full filesystem path to the wp-content directory
</span><span class="cx"> * @param string $file filesystem path relative to the WordPress install directory or to the wp-content directory
</span><span class="cx"> * @return string full file system path to edit
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> * @uses current_user_can
</span><span class="cx"> * @uses wp_upload_dir
</span><span class="cx"> * @uses wp_unique_filename
</span><del>- * @uses delete_transient
</del><ins>+ * @uses delete_transient
</ins><span class="cx"> * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
</span><span class="cx"> * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).
</span><span class="cx"> * @return array On success, returns an associative array of file attributes. On failure, returns $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/list-table.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_list_table( $class ) {
</span><span class="cx"> $class = apply_filters( "get_list_table_$class", $class );
</span><del>-
</del><ins>+
</ins><span class="cx"> require_list_table( $class );
</span><span class="cx">
</span><span class="cx"> if ( class_exists( $class ) )
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/media.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx"> $thumb_url = false;
</span><span class="cx">
</span><span class="cx"> $post = get_post( $attachment_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> $default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
</span><span class="cx"> $args = wp_parse_args( $args, $default_args );
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
</span><span class="cx"> $post_formats = get_theme_support( 'post-formats' );
</span><span class="cx">
</span><del>-if ( is_array( $post_formats[0] ) ) :
</del><ins>+if ( is_array( $post_formats[0] ) ) :
</ins><span class="cx"> $post_format = get_post_format( $post->ID );
</span><span class="cx"> if ( !$post_format )
</span><span class="cx"> $post_format = '0';
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/plugin.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $plugin Plugin path to main plugin file with plugin data.
</span><span class="cx"> * @param string $redirect Optional. URL to redirect to.
</span><del>- * @param bool $network_wide Whether to enable the plugin for all sites in the
</del><ins>+ * @param bool $network_wide Whether to enable the plugin for all sites in the
</ins><span class="cx"> * network or just the current site. Multisite only. Default is false.
</span><span class="cx"> * @param bool $silent Prevent calling activation hooks. Optional, default is false.
</span><span class="cx"> * @return WP_Error|null WP_Error on invalid file or null on success.
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/includes/template.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -2119,7 +2119,7 @@
</span><span class="cx"> $class = $type; // Custom cases can just pass in the classes they want to be used
</span><span class="cx"> endswitch;
</span><span class="cx"> $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
</span><del>-
</del><ins>+
</ins><span class="cx"> $attributes = '';
</span><span class="cx"> if ( is_array( $other_attributes ) ) {
</span><span class="cx"> foreach ( $other_attributes as $attribute => $value ) {
</span><span class="lines">@@ -2128,19 +2128,19 @@
</span><span class="cx"> } else if ( !empty( $other_attributes ) ) { // Attributes provided as a string
</span><span class="cx"> $attributes = $other_attributes;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Default the id attribute to $name unless an id was specifically provided in $other_attributes
</span><span class="cx"> $id = $name;
</span><span class="cx"> if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) )
</span><span class="cx"> $id = $other_attributes['id'];
</span><del>-
</del><ins>+
</ins><span class="cx"> $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
</span><span class="cx"> $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $wrap ) {
</span><span class="cx"> $button = '<p class="submit">' . $button . '</p>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $button;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/js/list-table.dev.js 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> if ( true === value )
</span><span class="cx"> data[key] = '';
</span><span class="cx"> else
</span><del>- data[key] = value;
</del><ins>+ data[key] = value;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this._callback = callback;
</span></span></pre></div>
<a id="trunkwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/media.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> wp_enqueue_script( 'wp-ajax-response' );
</span><span class="cx"> wp_enqueue_script('image-edit');
</span><span class="cx"> wp_enqueue_style('imgareaselect');
</span><del>-
</del><ins>+
</ins><span class="cx"> add_contextual_help( $current_screen,
</span><span class="cx"> '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
</span><span class="cx"> '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-admin/widgets.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> <a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
</span><span class="cx"> <?php
</span><span class="cx"> } else {
</span><del>- submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
</del><ins>+ submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
</ins><span class="cx"> }
</span><span class="cx"> submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
</span><span class="cx"> <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/admin-bar.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * This code handles the building and rendering of the press bar.
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Instantiate the admin bar object and set it up as a global for access elsewhere.
</span><span class="cx"> *
</span><span class="lines">@@ -22,11 +22,11 @@
</span><span class="cx">
</span><span class="cx"> /* Instantiate the admin bar */
</span><span class="cx"> $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
</span><del>- if ( class_exists( $admin_bar_class ) )
</del><ins>+ if ( class_exists( $admin_bar_class ) )
</ins><span class="cx"> $wp_admin_bar = new $admin_bar_class;
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_admin_bar->initialize();
</span><span class="cx"> $wp_admin_bar->add_menus();
</span><span class="cx">
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> $wp_admin_bar->render();
</span><span class="cx">
</span><span class="cx"> do_action( 'wp_after_admin_bar_render' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_admin_bar->unload_user_locale_translations();
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
</span><span class="lines">@@ -87,11 +87,11 @@
</span><span class="cx"> global $wp_admin_bar, $user_identity;
</span><span class="cx">
</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"> /* Add the 'My Account' menu */
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity, 'href' => get_edit_profile_url( $user_id ) ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Add the "My Account" sub menus */
</span><span class="cx"> $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) );
</span><span class="cx"> if ( is_multisite() )
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Provide a shortlink.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_shortlink_menu() {
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Provide an edit link for posts and terms.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_edit_menu () {
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> $ptype_obj = get_post_type_object( $ptype );
</span><span class="cx"> if ( $ptype_obj->show_in_menu !== true || ! current_user_can( $ptype_obj->cap->edit_posts ) )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> $actions["post-new.php?post_type=$ptype"] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, "new-$ptype" );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
</span><span class="cx"> $wordpress_update_count = 1;
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
</span><span class="cx">
</span><span class="cx"> if ( !$update_count )
</span><span class="lines">@@ -297,16 +297,16 @@
</span><span class="cx"> function wp_admin_body_style() {
</span><span class="cx"> ?>
</span><span class="cx"> <style type="text/css">
</span><del>- <?php
-
- if (
- ( empty( $_GET['nobump'] ) || is_admin() ) &&
- ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
- ) :
</del><ins>+ <?php
+
+ if (
+ ( empty( $_GET['nobump'] ) || is_admin() ) &&
+ ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
+ ) :
</ins><span class="cx"> ?>
</span><span class="cx"> body { padding-top: 28px !important; }
</span><del>- <?php
- endif;
</del><ins>+ <?php
+ endif;
</ins><span class="cx">
</span><span class="cx"> if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
</span><span class="cx"> ?>
</span><span class="lines">@@ -328,11 +328,11 @@
</span><span class="cx"> */
</span><span class="cx"> function is_admin_bar_showing() {
</span><span class="cx"> global $show_admin_bar;
</span><del>-
</del><ins>+
</ins><span class="cx"> /* For all these types of request we never want an admin bar period */
</span><span class="cx"> if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
</span><span class="cx"> if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {
</span><span class="cx"> $show_admin_bar = false;
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/class-wp-admin-bar.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Set the protocol used throughout this code */
</span><del>- if ( is_ssl() )
</del><ins>+ if ( is_ssl() )
</ins><span class="cx"> $this->proto = 'https://';
</span><span class="cx">
</span><span class="cx"> $this->user = new stdClass;
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="adminbarsearch-wrap">
</span><span class="cx"> <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
</span><del>- <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" />
</del><ins>+ <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" />
</ins><span class="cx"> <button type="submit" class="adminbar-button"><span><?php _e('Search'); ?></span></button>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="lines">@@ -112,31 +112,31 @@
</span><span class="cx"> function recursive_render( $id, &$menu_item ) { ?>
</span><span class="cx"> <?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?>
</span><span class="cx">
</span><del>- <li class="<?php echo $menuclass . "ab-$id" ?><?php
- if ( ! empty( $menu_item['meta']['class'] ) ) :
</del><ins>+ <li class="<?php echo $menuclass . "ab-$id" ?><?php
+ if ( ! empty( $menu_item['meta']['class'] ) ) :
</ins><span class="cx"> echo ' ' . $menu_item['meta']['class'];
</span><del>- endif;
</del><ins>+ endif;
</ins><span class="cx"> ?>">
</span><del>- <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php
</del><ins>+ <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php
</ins><span class="cx"> if ( ! empty( $menu_item['meta']['onclick'] ) ) :
</span><del>- ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php
</del><ins>+ ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php
</ins><span class="cx"> endif;
</span><span class="cx"> if ( ! empty( $menu_item['meta']['target'] ) ) :
</span><del>- ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php
- endif;
-
- ?>><?php
-
- if ( ! empty( $menuclass ) ) :
- ?><span><?php
- endif;
-
</del><ins>+ ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php
+ endif;
+
+ ?>><?php
+
+ if ( ! empty( $menuclass ) ) :
+ ?><span><?php
+ endif;
+
</ins><span class="cx"> echo $menu_item['title'];
</span><del>-
- if ( ! empty( $menuclass ) ) :
- ?></span><?php
- endif;
-
</del><ins>+
+ if ( ! empty( $menuclass ) ) :
+ ?></span><?php
+ endif;
+
</ins><span class="cx"> ?></a>
</span><span class="cx">
</span><span class="cx"> <?php if ( ! empty( $menu_item['children'] ) ) : ?>
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> if ( ! empty( $menu->{$id}['children'] ) )
</span><span class="cx"> $this->add_node( $parent_id, $menu->{$id}['children'], $child );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $child = null;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> // TODO: Convert to a core feature for multisite or remove
</span><span class="cx"> function load_user_locale_translations() {
</span><span class="cx"> $this->need_to_change_locale = ( get_locale() != $this->user->locale );
</span><del>- if ( ! $this->need_to_change_locale )
</del><ins>+ if ( ! $this->need_to_change_locale )
</ins><span class="cx"> return;
</span><span class="cx"> /*
</span><span class="cx"> $this->previous_translations = get_translations_for_domain( 'default' );
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> function unload_user_locale_translations() {
</span><span class="cx"> global $l10n;
</span><del>- if ( ! $this->changed_locale )
</del><ins>+ if ( ! $this->changed_locale )
</ins><span class="cx"> return;
</span><span class="cx"> /*
</span><span class="cx"> remove_filter( 'locale', $this->adminbar_locale_filter );
</span></span></pre></div>
<a id="trunkwpincludesclasswphttpixrclientphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-http-ixr-client.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-http-ixr-client.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/class-wp-http-ixr-client.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> $this->path = '/';
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $this->scheme = 'http';
</del><ins>+ $this->scheme = 'http';
</ins><span class="cx"> $this->server = $server;
</span><span class="cx"> $this->path = $path;
</span><span class="cx"> $this->port = $port;
</span><span class="lines">@@ -45,30 +45,30 @@
</span><span class="cx"> 'user-agent' => $this->useragent,
</span><span class="cx"> 'body' => $xml,
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Merge Custom headers ala #8145
</span><span class="cx"> foreach ( $this->headers as $header => $value )
</span><span class="cx"> $args['headers'][$header] = $value;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $this->timeout !== false )
</span><span class="cx"> $args['timeout'] = $this->timeout;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Now send the request
</span><span class="cx"> if ($this->debug) {
</span><span class="cx"> echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $response = wp_remote_post($url, $args);
</del><ins>+ $response = wp_remote_post($url, $args);
</ins><span class="cx">
</span><del>- if ( is_wp_error($response) ) {
- $errno = $response->get_error_code();
- $errorstr = $response->get_error_message();
- $this->error = new IXR_Error(-32300, "transport error: $errno $errstr");
</del><ins>+ if ( is_wp_error($response) ) {
+ $errno = $response->get_error_code();
+ $errorstr = $response->get_error_message();
+ $this->error = new IXR_Error(-32300, "transport error: $errno $errstr");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- $code = $response['response']['code'];
- if ( $code != 200 ) {
</del><ins>+
+ $code = $response['response']['code'];
+ if ( $code != 200 ) {
</ins><span class="cx"> $this->error = new IXR_Error(-32301, "transport error - HTTP status code was not 200 ($code)"); return false;
</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 (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -1488,12 +1488,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @param array $args Method parameters. Contains:
</del><ins>+ * @param array $args Method parameters. Contains:
</ins><span class="cx"> * - blog_id
</span><span class="cx"> * - username
</span><span class="cx"> * - password
</span><span class="cx"> * - attachment_id
</span><del>- * @return array. Assocciative array containing:
</del><ins>+ * @return array. Assocciative array containing:
</ins><span class="cx"> * - 'date_created_gmt'
</span><span class="cx"> * - 'parent'
</span><span class="cx"> * - 'link'
</span><span class="lines">@@ -1545,18 +1545,18 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves a collection of media library items (or attachments)
</span><del>- *
- * Besides the common blog_id, username, and password arguments, it takes a filter
</del><ins>+ *
+ * Besides the common blog_id, username, and password arguments, it takes a filter
</ins><span class="cx"> * array as last argument.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Accepted 'filter' keys are 'parent_id', 'mime_type', 'offset', and 'number'.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The defaults are as follows:
</span><span class="cx"> * - 'number' - Default is 5. Total number of media items to retrieve.
</span><span class="cx"> * - 'offset' - Default is 0. See {@link WP_Query::query()} for more.
</span><span class="cx"> * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
</span><span class="cx"> * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args Method parameters. Contains:
</span><span class="lines">@@ -1587,7 +1587,7 @@
</span><span class="cx"> $mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : '' ;
</span><span class="cx"> $offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ;
</span><span class="cx"> $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
</span><del>-
</del><ins>+
</ins><span class="cx"> $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
</span><span class="cx"> $num_attachments = count($attachments);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-scripts.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-scripts.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/class.wp-scripts.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 0 === strpos( $src, '/wp-includes/js/l10n' ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( (array) $this->default_dirs as $test ) {
</span><span class="cx"> if ( 0 === strpos($src, $test) )
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/comment.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -1764,7 +1764,7 @@
</span><span class="cx"> global $wp_version;
</span><span class="cx"> include_once(ABSPATH . WPINC . '/class-IXR.php');
</span><span class="cx"> include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
</span><del>-
</del><ins>+
</ins><span class="cx"> // original code by Mort (http://mort.mine.nu:8080)
</span><span class="cx"> $post_links = array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/formatting.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Newline preservation help function for wpautop
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="cx"> * @param array $matches preg_replace_callback matches array
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> * Sanitize username stripping out unsafe characters.
</span><span class="cx"> *
</span><span class="cx"> * Removes tags, octets, entities, and if strict is enabled, will only keep
</span><del>- * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
</del><ins>+ * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
</ins><span class="cx"> * raw username (the username in the parameter), and the value of $strict as
</span><span class="cx"> * parameters for the 'sanitize_user' filter.
</span><span class="cx"> *
</span><span class="lines">@@ -1574,14 +1574,14 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Helper function to convert hex encoded chars to ascii
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="cx"> * @param $match the preg_replace_callback matches array
</span><span class="cx"> */
</span><del>-function _wp_iso_convert( $match ) {
- return chr( hexdec( strtolower( $match[1] ) ) );
-}
</del><ins>+function _wp_iso_convert( $match ) {
+ return chr( hexdec( strtolower( $match[1] ) ) );
+}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns a date in the GMT equivalent.
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/functions.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
</span><span class="cx"> }
</span><span class="cx"> $timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
</span><del>- $timezone_formats_re = implode( '|', $timezone_formats );
</del><ins>+ $timezone_formats_re = implode( '|', $timezone_formats );
</ins><span class="cx"> if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) && wp_timezone_supported() ) {
</span><span class="cx"> $timezone_string = get_option( 'timezone_string' );
</span><span class="cx"> if ( $timezone_string ) {
</span><span class="lines">@@ -132,9 +132,9 @@
</span><span class="cx"> $dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
</span><span class="cx"> $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
</span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> $j = @$datefunc( $dateformatstring, $i );
</span><span class="cx"> // allow plugins to redo this entirely for languages with untypical grammars
</span><span class="cx"> $j = apply_filters('date_i18n', $j, $req_format, $i, $gmt);
</span><span class="lines">@@ -1184,7 +1184,7 @@
</span><span class="cx"> */
</span><span class="cx"> function do_enclose( $content, $post_ID ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> //TODO: Tidy this ghetto code up and make the debug code optional
</span><span class="cx"> include_once( ABSPATH . WPINC . '/class-IXR.php' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/l10n.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Translate the result of _n_noop() or _nx_noop()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1
</span><span class="cx"> * @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()
</span><span class="cx"> * @param int $count number of objects
</span></span></pre></div>
<a id="trunkwpincludesmsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-admin-bar.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-admin-bar.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/ms-admin-bar.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -12,11 +12,11 @@
</span><span class="cx">
</span><span class="cx"> /* Get the settings we need for the current site */
</span><span class="cx"> $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog';
</span><del>- $maturetext_confirm = $current_blog->mature ?
- sprintf(
</del><ins>+ $maturetext_confirm = $current_blog->mature ?
+ sprintf(
</ins><span class="cx"> esc_attr__( 'Are you sure you want to unmark %s as mature?' ),
</span><span class="cx"> $current_blog->domain
</span><del>- ) :
</del><ins>+ ) :
</ins><span class="cx"> sprintf(
</span><span class="cx"> esc_attr__( 'Are you sure you want to mark %s as mature?' ),
</span><span class="cx"> $current_blog->domain
</span><span class="lines">@@ -24,15 +24,15 @@
</span><span class="cx">
</span><span class="cx"> $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog';
</span><span class="cx"> $suspendtext_confirm = $current_blog->spam ?
</span><del>- sprintf(
</del><ins>+ sprintf(
</ins><span class="cx"> esc_attr__( 'Are you sure you want to unsuspend site %s?' ),
</span><span class="cx"> $current_blog->domain
</span><del>- ) :
</del><ins>+ ) :
</ins><span class="cx"> sprintf(
</span><span class="cx"> esc_attr__( 'Are you sure you want to suspend site %s?' ),
</span><span class="cx"> $current_blog->domain
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $mature_url = network_admin_url( "edit.php?action=confirm&amp;action2={$matureaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( $maturetext_confirm ) );
</span><span class="cx"> $suspend_url = network_admin_url( "edit.php?action=confirm&amp;action2={$suspendaction}&amp;id={$current_blog->blog_id}&amp;msg=" . urlencode( $suspendtext_confirm ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/ms-functions.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx">
</span><span class="cx"> function add_existing_user_to_blog( $details = false ) {
</span><span class="cx"> global $blog_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_array( $details ) ) {
</span><span class="cx"> $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
</span><span class="cx"> do_action( 'added_existing_user', $details[ 'user_id' ], $result );
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/post-template.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -230,14 +230,14 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Preview fix for javascript bug with foreign languages
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="cx"> * @param array $match Match array from preg_replace_callback
</span><span class="cx"> * @returns string
</span><span class="cx"> */
</span><span class="cx"> function _convert_urlencoded_to_entities( $match ) {
</span><del>- return '&#' . base_convert( $match[1], 16, 10 ) . ';';
</del><ins>+ return '&#' . base_convert( $match[1], 16, 10 ) . ';';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> $classes[] = $post->post_type;
</span><span class="cx"> $classes[] = 'type-' . $post->post_type;
</span><span class="cx"> $classes[] = 'status-' . $post->post_status;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Post Format
</span><span class="cx"> $post_format = get_post_format( $post->ID );
</span><span class="cx">
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> // post requires password
</span><span class="cx"> if ( post_password_required($post->ID) )
</span><span class="cx"> $classes[] = 'post-password-required';
</span><del>-
</del><ins>+
</ins><span class="cx"> // sticky for Sticky Posts
</span><span class="cx"> if ( is_sticky($post->ID) && is_home() && !is_paged() )
</span><span class="cx"> $classes[] = 'sticky';
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> $classes[] = 'single';
</span><span class="cx"> $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
</span><span class="cx"> $classes[] = 'postid-' . $post_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Post Format
</span><span class="cx"> $post_format = get_post_format( $post->ID );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/post.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -2273,7 +2273,7 @@
</span><span class="cx"> _deprecated_argument( __FUNCTION__, '3.1', __( 'Passing an integer number of posts is deprecated. Pass an array of arguments instead.' ) );
</span><span class="cx"> $args = array( 'numberposts' => absint( $args ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set default arguments
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'numberposts' => 10, 'offset' => 0,
</span><span class="lines">@@ -3137,9 +3137,9 @@
</span><span class="cx"> $path = '/' . $leaf_path;
</span><span class="cx"> $curpage = $page;
</span><span class="cx"> while ( $curpage->post_parent != 0 ) {
</span><del>- $post_parent = $curpage->post_parent;
- $curpage = wp_cache_get( $post_parent, 'posts' );
- if ( false === $curpage )
</del><ins>+ $post_parent = $curpage->post_parent;
+ $curpage = wp_cache_get( $post_parent, 'posts' );
+ if ( false === $curpage )
</ins><span class="cx"> $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $post_parent, $post_type ) );
</span><span class="cx"> $path = '/' . $curpage->post_name . $path;
</span><span class="cx"> }
</span><span class="lines">@@ -5241,7 +5241,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @return array The array of translations
</del><ins>+ * @return array The array of translations
</ins><span class="cx"> */
</span><span class="cx"> function get_post_format_strings() {
</span><span class="cx"> $strings = array(
</span><span class="lines">@@ -5260,7 +5260,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns a pretty, translated version of a post format slug
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $slug A post format slug
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/query.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve ID of the current queried object. Wrapper for $wp_query->get_queried_object_id()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses WP_Query::get_queried_object_id()
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/script-loader.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> // Always ensure that we have the convertEntities function
</span><span class="cx"> $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' );
</span><span class="cx"> $scripts->enqueue( 'l10n' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20101116' );
</span><span class="lines">@@ -260,15 +260,15 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
</span><del>- $scripts->add_data( 'user-profile', 'group', 1 );
</del><ins>+ $scripts->add_data( 'user-profile', 'group', 1 );
</ins><span class="cx">
</span><span class="cx"> $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101117');
</span><del>- $scripts->add_data( 'admin-bar', 'group', 1 );
</del><ins>+ $scripts->add_data( 'admin-bar', 'group', 1 );
</ins><span class="cx"> $scripts->localize( 'admin-bar', 'adminBarL10n', array(
</span><span class="cx"> 'url' => __( 'URL:' ),
</span><span class="cx"> 'noShortlink' => __( 'No shortlink available for this page.' ),
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
</span><span class="cx"> $scripts->add_data( 'ajaxcat', 'group', 1 );
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
</span><span class="cx"> $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
</span><span class="cx"> $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Admin bar
</span><span class="cx"> $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101117' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16437 => 16438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-11-17 18:25:42 UTC (rev 16437)
+++ trunk/wp-includes/taxonomy.php 2010-11-17 18:47:34 UTC (rev 16438)
</span><span class="lines">@@ -590,10 +590,10 @@
</span><span class="cx"> else {
</span><span class="cx"> // NOT IN is very slow for some reason
</span><span class="cx"> $where .= " AND $primary_table.$primary_id_column IN (
</span><del>- SELECT object_id
- FROM $wpdb->term_relationships
- WHERE term_taxonomy_id $operator ($terms)
- )";
</del><ins>+ SELECT object_id
+ FROM $wpdb->term_relationships
+ WHERE term_taxonomy_id $operator ($terms)
+ )";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1179,7 +1179,7 @@
</span><span class="cx"> foreach ( $pieces as $piece )
</span><span class="cx"> $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</span><span class="cx">
</span><del>- $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
</del><ins>+ $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
</ins><span class="cx">
</span><span class="cx"> $fields = $_fields;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>