<!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>[15843] trunk: Pinking shears.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15843">15843</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-19 07:48:22 +0000 (Tue, 19 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmincssnavmenudevcss">trunk/wp-admin/css/nav-menu.dev.css</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesbookmarkphp">trunk/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminincludeslisttablephp">trunk/wp-admin/includes/list-table.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.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="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-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="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentsphp">trunk/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunkwpincludesthemecompatfooterphp">trunk/wp-includes/theme-compat/footer.php</a></li>
<li><a href="#trunkwpincludesthemecompatheaderphp">trunk/wp-includes/theme-compat/header.php</a></li>
<li><a href="#trunkwpincludesthemecompatsidebarphp">trunk/wp-includes/theme-compat/sidebar.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/admin.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -215,13 +215,13 @@
</span><span class="cx"> exit();
</span><span class="cx"> } else {
</span><span class="cx"> do_action("load-$pagenow");
</span><del>- // Backwards compatibility with old load-page-new.php, load-page.php,
- // and load-categories.php actions.
- if ( $typenow == 'page' ) {
- if ( $pagenow == 'post-new.php' )
- do_action( 'load-page-new.php' );
- elseif ( $pagenow == 'post.php' )
- do_action( 'load-page.php' );
</del><ins>+ // Backwards compatibility with old load-page-new.php, load-page.php,
+ // and load-categories.php actions.
+ if ( $typenow == 'page' ) {
+ if ( $pagenow == 'post-new.php' )
+ do_action( 'load-page-new.php' );
+ elseif ( $pagenow == 'post.php' )
+ do_action( 'load-page.php' );
</ins><span class="cx"> } elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
</span><span class="cx"> do_action( 'load-categories.php' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincssnavmenudevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu.dev.css (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu.dev.css 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/css/nav-menu.dev.css 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> #menu-management .menu-add-new abbr {
</span><span class="cx"> font-weight:bold;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> #nav-menu-footer {
</span><span class="cx"> border-width: 0 1px 1px 1px;
</span><span class="cx"> -moz-border-radius-bottomleft: 6px;
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/custom-header.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -558,9 +558,9 @@
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx"> <?php endif;
</span><del>-
-do_action( 'custom_header_options' );
</del><span class="cx">
</span><ins>+do_action( 'custom_header_options' );
+
</ins><span class="cx"> wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php submit_button(); ?>
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" />
</span><span class="cx"> <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
</span><span class="cx"> <?php wp_nonce_field( 'custom-header-crop-image' ) ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php submit_button( __( 'Crop and Publish' ) ); ?>
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/bookmark.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/bookmark.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/includes/bookmark.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * This function inserts/updates links into/in the database.
</del><ins>+ * This function inserts/updates links into/in the database.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $link_id ID of link to update
</span><del>- * @param array $link_categories Array of categories to
</del><ins>+ * @param array $link_categories Array of categories to
</ins><span class="cx"> */
</span><span class="cx"> function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
</span><span class="cx"> // If $link_categories isn't already an array, make it one:
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
</span><span class="cx">
</span><span class="cx"> $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
</span><del>- $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
</del><ins>+ $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
</ins><span class="cx">
</span><span class="cx"> if ( $this->hierarchical_display )
</span><span class="cx"> $total_pages = ceil( $total_items / $per_page );
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">
</span><span class="cx"> $status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $status_links;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -735,11 +735,11 @@
</span><span class="cx"> $authors_dropdown = '';
</span><span class="cx">
</span><span class="cx"> if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
</span><del>- $users_opt = array(
- 'name' => 'post_author',
- 'class'=> 'authors',
- 'multi' => 1,
- 'echo' => 0
</del><ins>+ $users_opt = array(
+ 'name' => 'post_author',
+ 'class'=> 'authors',
+ 'multi' => 1,
+ 'echo' => 0
</ins><span class="cx"> );
</span><span class="cx"> if ( $bulk )
</span><span class="cx"> $users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> function check_permissions() {
</span><span class="cx"> if ( !current_user_can('upload_files') )
</span><span class="cx"> wp_die( __( 'You do not have permission to upload files.' ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
</span><span class="lines">@@ -1488,10 +1488,10 @@
</span><span class="cx"> $args['order'] = trim( stripslashes( $_REQUEST['order'] ) );
</span><span class="cx">
</span><span class="cx"> $this->callback_args = $args;
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->set_pagination_args( array(
</span><span class="cx"> 'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
</span><del>- 'per_page' => $tags_per_page,
</del><ins>+ 'per_page' => $tags_per_page,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1677,7 +1677,7 @@
</span><span class="cx">
</span><span class="cx"> return $out;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function column_description( $tag ) {
</span><span class="cx"> return $tag->description;
</span><span class="cx"> }
</span><span class="lines">@@ -1711,7 +1711,7 @@
</span><span class="cx">
</span><span class="cx"> function column_default( $tag, $column_name ) {
</span><span class="cx"> global $taxonomy;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
</span><span class="cx"> $out .= "</td>";
</span><span class="cx"> }
</span><span class="lines">@@ -1820,10 +1820,10 @@
</span><span class="cx"> $wp_user_search = new WP_User_Query( $args );
</span><span class="cx">
</span><span class="cx"> $this->items = $wp_user_search->get_results();
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->set_pagination_args( array(
</span><span class="cx"> 'total_items' => $wp_user_search->get_total(),
</span><del>- 'per_page' => $users_per_page,
</del><ins>+ 'per_page' => $users_per_page,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1888,7 +1888,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function current_action() {
</span><span class="cx"> if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
</span><span class="cx"> return 'promote';
</span><span class="lines">@@ -2563,7 +2563,7 @@
</span><span class="cx"> $args['order'] = $order;
</span><span class="cx">
</span><span class="cx"> $this->items = get_bookmarks( $args );
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> function no_items() {
</span><span class="cx"> _e( 'No links found.' );
</span><span class="lines">@@ -2724,7 +2724,7 @@
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function check_permissions() {
</del><ins>+ function check_permissions() {
</ins><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -3014,7 +3014,7 @@
</span><span class="cx"> function check_permissions() {
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! current_user_can( 'manage_network_users' ) )
</span><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -3045,10 +3045,10 @@
</span><span class="cx"> $wp_user_search = new WP_User_Query( $args );
</span><span class="cx">
</span><span class="cx"> $this->items = $wp_user_search->get_results();
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->set_pagination_args( array(
</span><span class="cx"> 'total_items' => $wp_user_search->get_total(),
</span><del>- 'per_page' => $users_per_page,
</del><ins>+ 'per_page' => $users_per_page,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3367,7 +3367,7 @@
</span><span class="cx"> }
</span><span class="cx"> uasort( $this->items, '_order_plugins_callback' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
</span><span class="cx">
</span><span class="cx"> $start = ( $page - 1 ) * $plugins_per_page;
</span><span class="lines">@@ -3416,7 +3416,7 @@
</span><span class="cx">
</span><span class="cx"> function get_views() {
</span><span class="cx"> global $totals, $status;
</span><del>-
</del><ins>+
</ins><span class="cx"> $status_links = array();
</span><span class="cx"> foreach ( $totals as $type => $count ) {
</span><span class="cx"> if ( !$count )
</span><span class="lines">@@ -3452,7 +3452,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>",
</del><ins>+ $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>",
</ins><span class="cx"> add_query_arg('plugin_status', $type, 'plugins.php'),
</span><span class="cx"> ( $type == $status ) ? ' class="current"' : '',
</span><span class="cx"> sprintf( $text, number_format_i18n( $count ) )
</span><span class="lines">@@ -3640,7 +3640,7 @@
</span><span class="cx">
</span><span class="cx"> function check_permissions() {
</span><span class="cx"> if ( ! current_user_can('install_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><span class="lines">@@ -4081,8 +4081,8 @@
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> include( ABSPATH . 'wp-admin/includes/theme-install.php' );
</span><span class="cx">
</span><del>- global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
-
</del><ins>+ global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
+
</ins><span class="cx"> wp_reset_vars( array( 'tab' ) );
</span><span class="cx">
</span><span class="cx"> $paged = $this->get_pagenum();
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/includes/list-table.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
</span><span class="cx"> return $_REQUEST['action2'];
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_pagenum( $query_var = 'paged' ) {
</span><span class="cx"> $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> return max( 1, $pagenum );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> *
</span><span class="cx"> * @return int
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function get_items_per_page( $option, $default = 20 ) {
</span><span class="cx"> $per_page = (int) get_user_option( $option );
</span><span class="cx"> if ( empty( $per_page ) || $per_page < 1 )
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> *
</span><span class="cx"> * @return array
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function get_table_classes() {
</span><span class="cx"> extract( $this->_args );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -508,8 +508,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
</span><span class="cx"> <?php
</span><del>- wp_dropdown_users( array(
- 'name' => 'post_author_override',
</del><ins>+ wp_dropdown_users( array(
+ 'name' => 'post_author_override',
</ins><span class="cx"> 'selected' => empty($post->ID) ? $user_ID : $post->post_author
</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 (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/includes/template.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -2072,7 +2072,7 @@
</span><span class="cx">
</span><span class="cx"> $current_screen->is_network = is_network_admin() ? true : false;
</span><span class="cx"> $current_screen->is_user = is_user_admin() ? true : false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $current_screen->is_network ) {
</span><span class="cx"> $current_screen->base .= '-network';
</span><span class="cx"> $current_screen->id .= '-network';
</span></span></pre></div>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/js/list-table.dev.js 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> this._callback = callback;
</span><span class="cx">
</span><span class="cx"> this.fetch_list(
</span><del>- data,
</del><ins>+ data,
</ins><span class="cx"> $.proxy(this, 'handle_success'),
</span><span class="cx"> $.proxy(this, 'handle_error')
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/js/nav-menu.dev.js 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx"> takenIDs[newID] = true;
</span><span class="cx"> if ( newID != matched[1] ) {
</span><span class="cx"> $item.html( $item.html().replace(new RegExp(
</span><del>- 'menu-item\\[' + matched[1] + '\\]', 'g'),
</del><ins>+ 'menu-item\\[' + matched[1] + '\\]', 'g'),
</ins><span class="cx"> 'menu-item[' + newID + ']'
</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 (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/js/theme.dev.js 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> // Set the options
</span><span class="cx"> opts.search = $( 'input[name=s]' ).val();
</span><span class="cx"> opts.order = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
</span><del>-
</del><ins>+
</ins><span class="cx"> $( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
</span><span class="cx"> $( '#availablethemes td img' ).hide();
</span><span class="cx"> } );
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // These are the functions we expose
</span><span class="cx"> var api = {
</span><span class="cx"> init: init
</span><span class="lines">@@ -68,4 +68,4 @@
</span><span class="cx"> jQuery( document ).ready( function($) {
</span><span class="cx"> theme_viewer = new ThemeViewer();
</span><span class="cx"> theme_viewer.init();
</span><del>-});
</del><span class="cx">\ No newline at end of file
</span><ins>+});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/network/edit.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> submit_button( __('Confirm Deletion'), 'delete' );
</span><span class="cx"> ?>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/options-general.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> $.post(ajaxurl, {
</span><span class="cx"> action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
</span><span class="cx"> date : format.val(),
</span><del>- }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
</del><ins>+ }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> //]]>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-admin/themes.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo implode ( ' | ', $options );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $ct->tags ) : ?>
</span><span class="cx"> <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> <?php foreach ( $feature_list as $feature_name => $features ) :
</span><span class="cx"> $feature_name = esc_html( $feature_name ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="feature-container">
</span><span class="cx"> <div class="feature-name"><?php echo $feature_name ?></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/canonical.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -342,13 +342,13 @@
</span><span class="cx">
</span><span class="cx"> if ( !$redirect_url || $redirect_url == $requested_url )
</span><span class="cx"> return false;
</span><del>-
- // Hex encoded octets are case-insensitive.
</del><ins>+
+ // Hex encoded octets are case-insensitive.
</ins><span class="cx"> if ( false !== strpos($requested_url, '%') ) {
</span><span class="cx"> if ( !function_exists('lowercase_octets') ) {
</span><del>- function lowercase_octets($matches) {
- return strtolower( $matches[0] );
- }
</del><ins>+ function lowercase_octets($matches) {
+ return strtolower( $matches[0] );
+ }
</ins><span class="cx"> }
</span><span class="cx"> $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/category-template.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -963,7 +963,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Check if the current post has any of given terms.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The given terms are checked against the post's terms' term_ids, names and slugs.
</span><span class="cx"> * Terms given as integers will only be checked against the post's terms' term_ids.
</span><span class="cx"> * If no terms are given, determines if post has any terms.
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/comment.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> wp_cache_add( $cache_key, $comments, 'comment' );
</span><span class="cx">
</span><del>- return $comments;
</del><ins>+ return $comments;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/functions.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -4342,7 +4342,7 @@
</span><span class="cx"> * Finds hierarchy loops using a callback function that maps objects to parents.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><del>- * @access private
</del><ins>+ * @access private
</ins><span class="cx"> *
</span><span class="cx"> * @param callback $callback function that accepts ( ID, callback_arg, ... ) and outputs parent_ID
</span><span class="cx"> * @param $start The ID to start the loop check at
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/general-template.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> if ( ! is_post_type_archive() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
</span><span class="cx"> $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
</span><span class="cx">
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> else
</span><span class="cx"> return $title;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Display or retrieve page title for category archive.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/link-template.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -858,9 +858,9 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $post_type Post type
</span><del>- * @param string $feed Optional. Feed type
</del><ins>+ * @param string $feed Optional. Feed type
</ins><span class="cx"> * @return string
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
</span><span class="cx"> $default_feed = get_default_feed();
</span><span class="cx"> if ( empty( $feed ) )
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/ms-blogs.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> * Retrieve the details for a blog from the blogs table and blog options.
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against.
</span><span class="cx"> * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
</span><span class="cx"> * @return object Blog details.
</span><span class="lines">@@ -488,9 +488,9 @@
</span><span class="cx"> $wp_roles->__construct();
</span><span class="cx"> $wpdb->suppress_errors( false );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( did_action('init') ) {
</span><del>- $current_user = wp_get_current_user();
</del><ins>+ $current_user = wp_get_current_user();
</ins><span class="cx"> if ( is_object( $current_user ) )
</span><span class="cx"> $current_user->for_blog( $blog_id );
</span><span class="cx"> }
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> * Get a list of most recently updated blogs.
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param $deprecated Not used
</span><span class="cx"> * @param int $start The offset
</span><span class="cx"> * @param int $quantity The maximum number of blogs to retrieve. Default is 40.
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/ms-functions.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU 1.1
</span><span class="cx"> * @uses get_blogs_of_user()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $user_id The unique ID of the user
</span><span class="cx"> * @param int $blog Optional. If no blog_id is provided, current site is used
</span><span class="cx"> * @return bool
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> * Use the 'remove_user_from_blog' action to fire an event when
</span><span class="cx"> * users are removed from a blog.
</span><span class="cx"> *
</span><del>- * Accepts an optional $reassign parameter, if you want to
</del><ins>+ * Accepts an optional $reassign parameter, if you want to
</ins><span class="cx"> * reassign the user's blog posts to another user upon removal.
</span><span class="cx"> *
</span><span class="cx"> * @since MU 1.0
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/nav-menu-template.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> $sorted_menu_items[$menu_item->menu_order] = $menu_item;
</span><span class="cx">
</span><span class="cx"> unset($menu_items);
</span><del>-
</del><ins>+
</ins><span class="cx"> $sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
</span><span class="cx">
</span><span class="cx"> $items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );
</span><span class="lines">@@ -314,9 +314,9 @@
</span><span class="cx"> $possible_object_parents = array_filter( $possible_object_parents );
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $menu_items as $key => $menu_item ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_items[$key]->current = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $classes = (array) $menu_item->classes;
</span><span class="cx"> $classes[] = 'menu-item';
</span><span class="cx"> $classes[] = 'menu-item-type-' . $menu_item->type;
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> $current_url = untrailingslashit( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
</span><span class="cx"> $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
</span><span class="cx"> $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
</span><span class="cx"> $classes[] = 'current-menu-item';
</span><span class="cx"> $menu_items[$key]->current = true;
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> $active_parent_object_ids[] = (int) $menu_item->post_parent;
</span><span class="cx"> $active_object = $menu_item->object;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( untrailingslashit($item_url) == home_url() )
</span><span class="cx"> $classes[] = 'menu-item-home';
</span><span class="cx"> }
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> $classes = (array) $parent_item->classes;
</span><span class="cx"> $menu_items[$key]->current_item_ancestor = false;
</span><span class="cx"> $menu_items[$key]->current_item_parent = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (
</span><span class="cx"> isset( $parent_item->type ) &&
</span><span class="cx"> (
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/post.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @uses has_term()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $format The format to check for
</span><span class="cx"> * @param object|id $post The post to check. If not supplied, defaults to the current post if used in the loop.
</span><span class="cx"> * @return bool True if the post has the format, false otherwise.
</span><span class="lines">@@ -3812,7 +3812,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Checked for changed slugs for published post objects and save the old slug.
</span><span class="cx"> *
</span><del>- * The function is used when a post object of any type is updated,
</del><ins>+ * The function is used when a post object of any type is updated,
</ins><span class="cx"> * by comparing the current and previous post objects.
</span><span class="cx"> *
</span><span class="cx"> * If the slug was changed and not already part of the old slugs then it will be
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/query.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> * Month, Year, Category, Author, ...
</span><span class="cx"> *
</span><span class="cx"> * If the $post_types parameter is specified, this function will additionally
</span><del>- * check if the query is for exactly one of the post types specified. If a plugin
</del><ins>+ * check if the query is for exactly one of the post types specified. If a plugin
</ins><span class="cx"> * is causing multiple post types to appear in the query, specifying a post type
</span><span class="cx"> * will cause this check to return false.
</span><span class="cx"> *
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> return $wp_query->is_post_type_archive( $post_types );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Is the query for an attachment page?
</span><span class="cx"> *
</span><span class="lines">@@ -2648,7 +2648,7 @@
</span><span class="cx"> * Month, Year, Category, Author, ...
</span><span class="cx"> *
</span><span class="cx"> * If the $post_types parameter is specified, this function will additionally
</span><del>- * check if the query is for exactly one of the post types specified. If a plugin
</del><ins>+ * check if the query is for exactly one of the post types specified. If a plugin
</ins><span class="cx"> * is causing multiple post types to appear in the query, specifying a post type
</span><span class="cx"> * will cause this check to return false.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/taxonomy.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> if ( $term = get_term_by( $field, $term, $taxonomy ) )
</span><span class="cx"> $term = $term->term_id;
</span><span class="cx"> else
</span><del>- continue;
</del><ins>+ continue;
</ins><span class="cx"> }
</span><span class="cx"> $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
</span><span class="cx"> $children[] = $term;
</span><span class="lines">@@ -1446,13 +1446,13 @@
</span><span class="cx"> $tt_id = $ids['term_taxonomy_id'];
</span><span class="cx">
</span><span class="cx"> $defaults = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'category' == $taxonomy ) {
</span><span class="cx"> $defaults['default'] = get_option( 'default_category' );
</span><span class="cx"> if ( $defaults['default'] == $term )
</span><span class="cx"> return 0; // Don't delete the default category
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx"> extract($args, EXTR_SKIP);
</span><span class="cx">
</span><span class="lines">@@ -2641,7 +2641,7 @@
</span><span class="cx"> $termlink = home_url( user_trailingslashit($termlink, 'category') );
</span><span class="cx"> }
</span><span class="cx"> // Back Compat filters.
</span><del>- if ( 'post_tag' == $taxonomy )
</del><ins>+ if ( 'post_tag' == $taxonomy )
</ins><span class="cx"> $termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
</span><span class="cx"> elseif ( 'category' == $taxonomy )
</span><span class="cx"> $termlink = apply_filters( 'category_link', $termlink, $term->term_id );
</span><span class="lines">@@ -2815,7 +2815,7 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Get an array of ancestor IDs for a given object.
</span><span class="cx"> *
</span><span class="lines">@@ -2825,13 +2825,13 @@
</span><span class="cx"> */
</span><span class="cx"> function get_ancestors($object_id = 0, $object_type = '') {
</span><span class="cx"> $object_id = (int) $object_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> $ancestors = array();
</span><span class="cx">
</span><span class="cx"> if ( empty( $object_id ) ) {
</span><span class="cx"> return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_taxonomy_hierarchical( $object_type ) ) {
</span><span class="cx"> $term = get_term($object_id, $object_type);
</span><span class="cx"> while ( ! is_wp_error($term) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
</span><span class="lines">@@ -2840,7 +2840,7 @@
</span><span class="cx"> }
</span><span class="cx"> } elseif ( null !== get_post_type_object( $object_type ) ) {
</span><span class="cx"> $object = get_post($object_id);
</span><del>- if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
</del><ins>+ if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
</ins><span class="cx"> $ancestors = $object->ancestors;
</span><span class="cx"> else {
</span><span class="cx"> while ( ! is_wp_error($object) && ! empty( $object->post_parent ) && ! in_array( $object->post_parent, $ancestors ) ) {
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments-popup.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/theme-compat/comments-popup.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Theme_Compat
</span><span class="cx"> * @deprecated 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This file is here for Backwards compatibility with old themes and will be removed in a future version
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> */
</span><span class="cx"> _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
</span><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></pre></div>
<a id="trunkwpincludesthemecompatcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/theme-compat/comments.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -3,18 +3,18 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Theme_Compat
</span><span class="cx"> * @deprecated 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This file is here for Backwards compatibility with old themes and will be removed in a future version
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> */
</span><span class="cx"> _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
</span><span class="cx">
</span><span class="cx"> // Do not delete these lines
</span><span class="cx"> if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
</span><span class="cx"> die ('Please do not load this page directly. Thanks!');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( post_password_required() ) { ?>
</span><del>- <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
</del><ins>+ <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx">
</span><span class="cx"> <h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
</span><span class="cx">
</span><del>-<div id="cancel-comment-reply">
</del><ins>+<div id="cancel-comment-reply">
</ins><span class="cx"> <small><?php cancel_comment_reply_link() ?></small>
</span><del>-</div>
</del><ins>+</div>
</ins><span class="cx">
</span><span class="cx"> <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
</span><span class="cx"> <p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
</span><span class="cx">
</span><span class="cx"> <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
</span><del>-<?php comment_id_fields(); ?>
</del><ins>+<?php comment_id_fields(); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemecompatfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/footer.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/footer.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/theme-compat/footer.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Theme_Compat
</span><span class="cx"> * @deprecated 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This file is here for Backwards compatibility with old themes and will be removed in a future version
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> */
</span><span class="cx"> _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesthemecompatheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/header.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/header.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/theme-compat/header.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Theme_Compat
</span><span class="cx"> * @deprecated 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This file is here for Backwards compatibility with old themes and will be removed in a future version
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> */
</span><span class="cx"> _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesthemecompatsidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/sidebar.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/sidebar.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/theme-compat/sidebar.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Theme_Compat
</span><span class="cx"> * @deprecated 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This file is here for Backwards compatibility with old themes and will be removed in a future version
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> */
</span><span class="cx"> _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/user.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id );
</span><span class="cx"> $order_meta = get_user_meta( $user_id, 'blog_order' );
</span><span class="cx"> $visible_meta = get_user_meta( $user_id, 'blog_visibility' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $order = $order_meta;
</span><span class="cx"> if ( !is_array( $order ) )
</span><span class="cx"> $order = array();
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> $visible = $visible_meta;
</span><span class="cx"> if ( !is_array( $visible ) )
</span><span class="cx"> $visible = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Index the blogs by userblog_id and set the visibility flag
</span><span class="cx"> // Visibility is on by default, unless a linked site then off
</span><span class="cx"> foreach ( $blogs as $blog ) {
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> // A previous change was saving the entire blog details into ordered, not just the blog ID - this detects it
</span><span class="cx"> if ( is_object( $id ) && isset( $id->userblog_id ) )
</span><span class="cx"> $id = $id->userblog_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_numeric( $id ) && isset( $newblogs[intval( $id )] ) ) {
</span><span class="cx"> $ordered[$id] = $newblogs[$id];
</span><span class="cx"> unset( $newblogs[$id] );
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> */
</span><span class="cx"> function is_blog_user( $blog_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx"> if ( !$blog_id )
</span><span class="cx"> $blog_id = $wpdb->blogid;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-includes/wp-db.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Sets the connection's character set.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param resource $dbh The resource given by mysql_connect
</span><span class="cx"> * @param string $charset The character set (optional)
</span><span class="cx"> * @param string $collate The collation (optional)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> * @return null Always null.
</span><span class="cx"> */
</span><span class="cx"> function select( $db, $dbh = null) {
</span><del>- if ( is_null($dbh) )
</del><ins>+ if ( is_null($dbh) )
</ins><span class="cx"> $dbh = $this->dbh;
</span><span class="cx">
</span><span class="cx"> if ( !@mysql_select_db( $db, $dbh ) ) {
</span><span class="lines">@@ -1043,7 +1043,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
</span><span class="cx"> "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
</span><del>-
</del><ins>+
</ins><span class="cx"> //If show errors is disabled then we need to die anyway as we don't have a working DB connection
</span><span class="cx"> die();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (15842 => 15843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-19 07:38:42 UTC (rev 15842)
+++ trunk/wp-login.php 2010-10-19 07:48:22 UTC (rev 15843)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $user ) )
</span><span class="cx"> return new WP_Error('invalid_key', __('Invalid key'));
</span><del>-
</del><ins>+
</ins><span class="cx"> return $user;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>