<!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>[15904] trunk: Pruning shears.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15904">15904</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-21 19:55:28 +0000 (Thu, 21 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pruning shears.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.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="#trunkwpadminjsthemedevjs">trunk/wp-admin/js/theme.dev.js</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesjsautosavedevjs">trunk/wp-includes/js/autosave.dev.js</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="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.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 (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/admin.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -215,7 +215,7 @@
</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,
</del><ins>+ // Backwards compatibility with old load-page-new.php, load-page.php,
</ins><span class="cx"> // and load-categories.php actions.
</span><span class="cx"> if ( $typenow == 'page' ) {
</span><span class="cx"> if ( $pagenow == 'post-new.php' )
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-10-21 19:55:28 UTC (rev 15904)
</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">@@ -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">@@ -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">@@ -2566,7 +2566,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">@@ -2727,7 +2727,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">@@ -3048,10 +3048,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">@@ -3371,7 +3371,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">@@ -3644,7 +3644,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">@@ -4085,8 +4085,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 (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/includes/list-table.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> function get_pagination_arg( $key ) {
</span><span class="cx"> if ( 'page' == $key )
</span><span class="cx"> return $this->get_pagenum();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $this->_pagination_args[$key] ) )
</span><span class="cx"> return $this->_pagination_args[$key];
</span><span class="cx"> }
</span><span class="lines">@@ -262,7 +262,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></pre></div>
<a id="trunkwpadminjsthemedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme.dev.js (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme.dev.js 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/js/theme.dev.js 2010-10-21 19:55:28 UTC (rev 15904)
</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></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/network/menu.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> $submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
</span><span class="cx">
</span><span class="cx"> $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
</span><del>-$update_plugins = get_site_transient( 'update_plugins' );
-if ( !empty($update_plugins->response) )
- $plugin_update_count = count( $update_plugins->response );
</del><ins>+$update_plugins = get_site_transient( 'update_plugins' );
+if ( !empty($update_plugins->response) )
+ $plugin_update_count = count( $update_plugins->response );
</ins><span class="cx"> $menu[20] = array(sprintf( __('Plugins %s'), "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
</span><span class="cx"> $submenu['plugins.php'][5] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php' );
</span><span class="cx"> $submenu['plugins.php'][10] = array( _x('Add New', 'plugin editor'), 'install_plugins', 'plugin-install.php' );
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/theme-install.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -40,14 +40,14 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php
</span><del>-screen_icon();
</del><ins>+screen_icon();
</ins><span class="cx">
</span><span class="cx"> if ( is_network_admin() ) : ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
</span><span class="cx">
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> $wp_list_table->views(); ?>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-admin/themes.php 2010-10-21 19:55:28 UTC (rev 15904)
</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 (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/canonical.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !$redirect_url || $redirect_url == $requested_url )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Hex encoded octets are case-insensitive.
</span><span class="cx"> if ( false !== strpos($requested_url, '%') ) {
</span><span class="cx"> if ( !function_exists('lowercase_octets') ) {
</span></span></pre></div>
<a id="trunkwpincludesjsautosavedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.dev.js (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.dev.js 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/js/autosave.dev.js 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -260,8 +260,8 @@
</span><span class="cx"> post_data["excerpt"] = jQuery("#excerpt").val();
</span><span class="cx"> if ( jQuery("#post_author").size() )
</span><span class="cx"> post_data["post_author"] = jQuery("#post_author").val();
</span><del>- if ( jQuery("#parent_id").val() )
- post_data["parent_id"] = jQuery("#parent_id").val();
</del><ins>+ if ( jQuery("#parent_id").val() )
+ post_data["parent_id"] = jQuery("#parent_id").val();
</ins><span class="cx"> post_data["user_ID"] = jQuery("#user-id").val();
</span><span class="cx"> if ( jQuery('#auto_draft').val() == '1' )
</span><span class="cx"> post_data["auto_draft"] = '1';
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/nav-menu-template.php 2010-10-21 19:55:28 UTC (rev 15904)
</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 (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/post.php 2010-10-21 19:55:28 UTC (rev 15904)
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 3.1.0
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function _add_post_type_submenus() {
</span><span class="cx"> foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
</span><span class="cx"> $ptype_obj = get_post_type_object( $ptype );
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/taxonomy.php 2010-10-21 19:55:28 UTC (rev 15904)
</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">@@ -2831,7 +2831,7 @@
</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></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-includes/wp-db.php 2010-10-21 19:55:28 UTC (rev 15904)
</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 (15903 => 15904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-21 18:35:52 UTC (rev 15903)
+++ trunk/wp-login.php 2010-10-21 19:55:28 UTC (rev 15904)
</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>