<!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>[14924] trunk: Strip trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14924">14924</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-26 02:42:15 +0000 (Wed, 26 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Strip trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsfreshdevcss">trunk/wp-admin/css/colors-fresh.dev.css</a></li>
<li><a href="#trunkwpadmincssinstalldevcss">trunk/wp-admin/css/install.dev.css</a></li>
<li><a href="#trunkwpadmincssnavmenurtldevcss">trunk/wp-admin/css/nav-menu-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssnavmenudevcss">trunk/wp-admin/css/nav-menu.dev.css</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminindexextraphp">trunk/wp-admin/index-extra.php</a></li>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsdefaultconstantsphp">trunk/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.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="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpmailphp">trunk/wp-mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsfreshdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.dev.css (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.dev.css 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/css/colors-fresh.dev.css 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1071,7 +1071,7 @@
</span><span class="cx">
</span><span class="cx"> #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
</span><span class="cx"> #adminmenu li.current a.menu-top {
</span><del>- background: #aaa url(../images/menu-bits.gif) top left repeat-x;
</del><ins>+ background: #aaa url(../images/menu-bits.gif) top left repeat-x;
</ins><span class="cx"> border: #aaa 1px solid;
</span><span class="cx"> color: #000;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincssinstalldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install.dev.css (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install.dev.css 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/css/install.dev.css 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -207,6 +207,6 @@
</span><span class="cx"> .message {
</span><span class="cx"> border: 1px solid #e6db55;
</span><span class="cx"> padding: 0.3em 0.6em;
</span><del>- margin: 5px 0 15px;
</del><ins>+ margin: 5px 0 15px;
</ins><span class="cx"> background-color: #ffffe0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincssnavmenurtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu-rtl.dev.css (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu-rtl.dev.css 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/css/nav-menu-rtl.dev.css 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> }
</span><span class="cx"> #side-sortables .potential-menu-item ul {
</span><span class="cx"> margin-right: 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Button Primary Actions */
</span></span></pre></div>
<a id="trunkwpadmincssnavmenudevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu.dev.css (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu.dev.css 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/css/nav-menu.dev.css 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> #menu-container .submit { margin: 0px 0px 10px; padding: 0px; }
</span><span class="cx">
</span><span class="cx"> .meta-sep,
</span><del>-.submitdelete,
</del><ins>+.submitdelete,
</ins><span class="cx"> .submitcancel {
</span><span class="cx"> display:block;
</span><span class="cx"> float:left;
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.button-controls {
</del><ins>+.button-controls {
</ins><span class="cx"> clear:both;
</span><span class="cx"> margin: 10px 0;
</span><span class="cx"> }
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> padding: 1em 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.menu ul {
</del><ins>+.menu ul {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx"> .menu ul.sub-menu {
</span><span class="lines">@@ -525,18 +525,18 @@
</span><span class="cx">
</span><span class="cx"> /* Clearfix */
</span><span class="cx"> #menu-item-name-wrap:after,
</span><del>-#menu-item-url-wrap:after,
</del><ins>+#menu-item-url-wrap:after,
</ins><span class="cx"> #menu-name-label:after,
</span><span class="cx"> #menu-settings-column .inside:after,
</span><del>-#nav-menus-frame:after,
</del><ins>+#nav-menus-frame:after,
</ins><span class="cx"> #post-body-content:after,
</span><del>-.button-controls:after,
</del><ins>+.button-controls:after,
</ins><span class="cx"> .major-publishing-actions:after,
</span><span class="cx"> .menu-item-settings:after {
</span><del>- clear: both;
</del><ins>+ clear: both;
</ins><span class="cx"> content: ".";
</span><span class="cx"> display: block;
</span><del>- height: 0;
</del><ins>+ height: 0;
</ins><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><span class="cx"> #nav-menus-frame, .button-controls, #menu-item-url-wrap, #menu-item-name-wrap { display: block; }
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/css/wp-admin.dev.css 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1175,14 +1175,14 @@
</span><span class="cx"> #sidemenu li a span.update-plugins {
</span><span class="cx"> position: absolute;
</span><span class="cx"> font-family: Helvetica, Arial, sans-serif;
</span><del>- font-size: 9px;
</del><ins>+ font-size: 9px;
</ins><span class="cx"> line-height: 17px;
</span><span class="cx"> font-weight: bold;
</span><del>- margin-top: 1px;
- margin-left: 7px;
- -moz-border-radius: 10px;
- -khtml-border-radius: 10px;
- -webkit-border-radius: 10px;
</del><ins>+ margin-top: 1px;
+ margin-left: 7px;
+ -moz-border-radius: 10px;
+ -khtml-border-radius: 10px;
+ -webkit-border-radius: 10px;
</ins><span class="cx"> border-radius: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/custom-header.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> elseif ( 2 == $step )
</span><span class="cx"> wp_enqueue_style('imgareaselect');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Check if header text is allowed
</span><span class="cx"> *
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> jQuery('#text-color').val(old_color);
</span><span class="cx"> jQuery('#name').css('color', old_color);
</span><span class="cx"> jQuery('#desc').css('color', old_color);
</span><del>- pickColor(old_color);
</del><ins>+ pickColor(old_color);
</ins><span class="cx"> } else {
</span><span class="cx"> //Hide text
</span><span class="cx"> jQuery( text_objects.toString() ).hide();
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> y2: yinit,
</span><span class="cx"> maxHeight: <?php echo HEADER_IMAGE_HEIGHT; ?>,
</span><span class="cx"> maxWidth: <?php echo HEADER_IMAGE_WIDTH; ?>,
</span><del>- onInit: function () {
</del><ins>+ onInit: function () {
</ins><span class="cx"> jQuery('#width').val(xinit);
</span><span class="cx"> jQuery('#height').val(yinit);
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/export.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> if ( $monthyears = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, YEAR(DATE_ADD(post_date, INTERVAL 1 MONTH)) AS `eyear`, MONTH(DATE_ADD(post_date, INTERVAL 1 MONTH)) AS `emonth` FROM $wpdb->posts WHERE post_type IN ($types) AND post_status IN ($stati) ORDER BY post_date ASC ") ) {
</span><span class="cx"> foreach ( $monthyears as $k => $monthyear )
</span><span class="cx"> $monthyears[$k]->lmonth = $wp_locale->get_month( $monthyear->month, 2 );
</span><del>- for( $s = 0, $e = count( $monthyears ) - 1; $e >= 0; $s++, $e-- ) {
</del><ins>+ for( $s = 0, $e = count( $monthyears ) - 1; $e >= 0; $s++, $e-- ) {
</ins><span class="cx"> $dateoptions .= "\t<option value=\"" . $monthyears[$s]->year . '-' . zeroise( $monthyears[$s]->month, 2 ) . '">' . $monthyears[$s]->lmonth . ' ' . $monthyears[$s]->year . "</option>\n";
</span><span class="cx"> $edateoptions .= "\t<option value=\"" . $monthyears[$e]->eyear . '-' . zeroise( $monthyears[$e]->emonth, 2 ) . '">' . $monthyears[$e]->lmonth . ' ' . $monthyears[$e]->year . "</option>\n";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1266,7 +1266,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && current_user_can( 'manage_network_plugins' ) )
</span><del>- $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
</del><ins>+ $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( $this->type == 'web' )
</span><span class="cx"> $install_actions['plugins_page'] = '<a href="' . admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>';
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/export.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -25,65 +25,65 @@
</span><span class="cx"> */
</span><span class="cx"> function export_wp( $args = array() ) {
</span><span class="cx"> global $wpdb, $post_ids, $post, $wp_taxonomies;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! is_array( $args ) )
</span><span class="cx"> $args = array( 'author' => $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> $defaults = array( 'author' => null, 'taxonomy' => null, 'post_type' => null, 'post_status' => null, 'start_date' => null, 'end_date' => null );
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>-
</del><ins>+
</ins><span class="cx"> extract($args);
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('export_wp');
</span><del>-
</del><ins>+
</ins><span class="cx"> if( strlen( $start_date ) > 4 && strlen( $end_date ) > 4 )
</span><span class="cx"> $filename = 'wordpress.' . $start_date . '.' . $end_date . '.xml';
</span><span class="cx"> else
</span><span class="cx"> $filename = 'wordpress.' . date( 'Y-m-d' ) . '.xml';
</span><del>-
</del><ins>+
</ins><span class="cx"> header( 'Content-Description: File Transfer' );
</span><span class="cx"> header( 'Content-Disposition: attachment; filename=' . $filename );
</span><span class="cx"> header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post_type && $post_type != 'all' )
</span><span class="cx"> $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
</span><span class="cx"> else
</span><span class="cx"> $where = "WHERE post_type != 'revision' ";
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $author && $author != 'all' ) {
</span><span class="cx"> $author_id = (int) $author;
</span><span class="cx"> $where .= $wpdb->prepare( "AND post_author = %d ", $author_id );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $start_date && $start_date != 'all' )
</span><span class="cx"> $where .= $wpdb->prepare( "AND post_date >= %s ", $start_date );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $end_date && $end_date != 'all' )
</span><span class="cx"> $where .= $wpdb->prepare( "AND post_date < %s ", $end_date );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $taxonomy && is_array( $taxonomy ) ) {
</span><span class="cx"> foreach ( $taxonomy as $term_id ) {
</span><span class="cx"> if ( $term_id != 'all' )
</span><span class="cx"> $where .= $wpdb->prepare( "AND ID IN (SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d) ", $term_id );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $post_status && $post_status != 'all' )
</span><span class="cx"> $where .= $wpdb->prepare( "AND post_status = %s", $status );
</span><del>-
</del><ins>+
</ins><span class="cx"> // grab a snapshot of post IDs, just in case it changes during the export
</span><span class="cx"> $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
</span><del>-
</del><ins>+
</ins><span class="cx"> $categories = (array) get_categories( array( 'get' => 'all' ) );
</span><span class="cx"> $tags = (array) get_tags( array( 'get' => 'all' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $custom_taxonomies = $wp_taxonomies;
</span><span class="cx"> unset( $custom_taxonomies['category'] );
</span><span class="cx"> unset( $custom_taxonomies['post_tag'] );
</span><span class="cx"> unset( $custom_taxonomies['link_category'] );
</span><span class="cx"> $custom_taxonomies = array_keys( $custom_taxonomies );
</span><span class="cx"> $terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -94,19 +94,19 @@
</span><span class="cx"> function wxr_missing_parents( $categories ) {
</span><span class="cx"> if ( ! is_array( $categories ) || empty( $categories ) )
</span><span class="cx"> return array();
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $categories as $category ){
</span><span class="cx"> $parents[$category->term_id] = $category->parent;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $parents = array_unique( array_diff( $parents, array_keys( $parents ) ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $zero = array_search( '0', $parents ) )
</span><span class="cx"> unset( $parents[$zero] );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $parents;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> while ( $parents = wxr_missing_parents( $categories ) ) {
</span><span class="cx"> $found_parents = get_categories( array( 'include' => join( ', ', $parents) ) );
</span><span class="cx"> if ( is_array( $found_parents ) && count( $found_parents ) )
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> else
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Put them in order to be inserted with no child going before its parent
</span><span class="cx"> $pass = 0;
</span><span class="cx"> $passes = 1000 + count( $categories );
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> $categories[] = $cat;
</span><span class="cx"> }
</span><span class="cx"> unset( $categories );
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Place string in CDATA tag.
</span><span class="cx"> *
</span><span class="lines">@@ -136,13 +136,13 @@
</span><span class="cx"> function wxr_cdata( $str ) {
</span><span class="cx"> if ( seems_utf8( $str ) == false )
</span><span class="cx"> $str = utf8_encode( $str );
</span><del>-
</del><ins>+
</ins><span class="cx"> // $str = ent2ncr(esc_html($str));
</span><span class="cx"> $str = "<![CDATA[$str" . ( ( substr( $str, -1 ) == ']' ) ? ' ' : '') . "]]>";
</span><del>-
</del><ins>+
</ins><span class="cx"> return $str;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wxr_site_url() {
</span><span class="cx"> global $current_site;
</span><del>-
</del><ins>+
</ins><span class="cx"> // mu: the base url
</span><span class="cx"> if ( isset( $current_site->domain ) )
</span><span class="cx"> return network_home_url();
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> else
</span><span class="cx"> return get_bloginfo_rss( 'url' );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -171,10 +171,10 @@
</span><span class="cx"> function wxr_cat_name( $c ) {
</span><span class="cx"> if ( empty( $c->name ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:cat_name>' . wxr_cdata( $c->name ) . '</wp:cat_name>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -185,10 +185,10 @@
</span><span class="cx"> function wxr_category_description( $c ) {
</span><span class="cx"> if ( empty( $c->description ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -199,10 +199,10 @@
</span><span class="cx"> function wxr_tag_name( $t ) {
</span><span class="cx"> if ( empty( $t->name ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx"> function wxr_tag_description( $t ) {
</span><span class="cx"> if ( empty( $t->description ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -227,10 +227,10 @@
</span><span class="cx"> function wxr_term_name( $t ) {
</span><span class="cx"> if ( empty( $t->name ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:term_name>' . wxr_cdata($t->name) . '</wp:term_name>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -241,10 +241,10 @@
</span><span class="cx"> function wxr_term_description( $t ) {
</span><span class="cx"> if ( empty( $t->description ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<wp:term_description>' . wxr_cdata($t->description) . '</wp:term_description>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Short Description}}
</span><span class="cx"> *
</span><span class="lines">@@ -252,10 +252,10 @@
</span><span class="cx"> */
</span><span class="cx"> function wxr_post_taxonomy() {
</span><span class="cx"> global $post;
</span><del>-
</del><ins>+
</ins><span class="cx"> $the_list = '';
</span><span class="cx"> $filter = 'rss';
</span><del>-
</del><ins>+
</ins><span class="cx"> $taxonomies = get_object_taxonomies( 'post' );
</span><span class="cx"> $terms = wp_get_post_terms( $post->ID, $taxonomies );
</span><span class="cx"> foreach ( (array) $terms as $term ) {
</span><span class="lines">@@ -271,9 +271,9 @@
</span><span class="cx"> }
</span><span class="cx"> echo $the_list;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
</span><span class="cx"> <!-- It contains information about your blog's posts, comments, and categories. -->
</span><span class="lines">@@ -319,18 +319,18 @@
</span><span class="cx"> <?php if ( $terms ) : foreach ( $terms as $t ) : ?>
</span><span class="cx"> <wp:term><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $custom_taxonomies[$t->parent]->name : ''; ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
</span><span class="cx"> <?php endforeach; endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php do_action( 'rss2_head' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( $post_ids ) {
</span><span class="cx"> global $wp_query;
</span><span class="cx"> $wp_query->in_the_loop = true; // Fake being in the loop.
</span><del>-
</del><ins>+
</ins><span class="cx"> // fetch 20 posts at a time rather than loading the entire table into memory
</span><span class="cx"> while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
</span><span class="cx"> $where = "WHERE ID IN (" . join( ',', $next_posts ) . ")";
</span><span class="cx"> $posts = $wpdb->get_results( "SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Begin Loop
</span><span class="cx"> foreach ($posts as $post) {
</span><span class="cx"> setup_postdata( $post );
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
</span><span class="cx"> <dc:creator><?php echo wxr_cdata( get_the_author() ); ?></dc:creator>
</span><span class="cx"> <?php wxr_post_taxonomy() ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <guid isPermaLink="false"><?php the_guid(); ?></guid>
</span><span class="cx"> <description></description>
</span><span class="cx"> <content:encoded><?php echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) ); ?></content:encoded>
</span><span class="lines">@@ -397,9 +397,9 @@
</span><span class="cx"> </wp:comment>
</span><span class="cx"> <?php } } ?>
</span><span class="cx"> </item>
</span><del>- <?php
- }
</del><ins>+ <?php
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx"> } ?>
</span><span class="cx"> </channel>
</span><span class="cx"> </rss>
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/file.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx">
</span><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> foreach ( $needed_dirs as $dir ) {
</span><del>- // Check the parent folders of the folders all exist within the creation array.
</del><ins>+ // Check the parent folders of the folders all exist within the creation array.
</ins><span class="cx"> if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx">
</span><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> foreach ( $needed_dirs as $dir ) {
</span><del>- // Check the parent folders of the folders all exist within the creation array.
</del><ins>+ // Check the parent folders of the folders all exist within the creation array.
</ins><span class="cx"> if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/nav-menu.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
</span><span class="cx"> $taxonomy_name = $taxonomy['args']->name;
</span><del>-
</del><ins>+
</ins><span class="cx"> // paginate browsing for large numbers of objects
</span><span class="cx"> $per_page = 50;
</span><span class="cx"> $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx"> $result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
</span><span class="cx"> $result .= __('Select menu items (pages, categories, links) from the boxes at left to begin building your custom menu.');
</span><span class="cx"> $result .= '</div>';
</span><del>-
</del><ins>+
</ins><span class="cx"> if( empty($menu_items) )
</span><span class="cx"> return $result;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/post.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -315,9 +315,9 @@
</span><span class="cx"> $taxonomy_obj = get_taxonomy($tax_name);
</span><span class="cx"> if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
</span><span class="cx"> $new_terms = $tax_input[$tax_name];
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> $new_terms = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $taxonomy_obj->hierarchical )
</span><span class="cx"> $current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
</span><span class="cx"> else
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> $post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
</span><span class="cx"> $cats = (array) wp_get_post_categories($post_ID);
</span><span class="cx"> $post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/schema.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> 'subdomain_install' => intval( $subdomain_install ),
</span><span class="cx"> 'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
</span><span class="cx"> );
</span><del>- if ( !intval( $subdomain_install ) )
</del><ins>+ if ( !intval( $subdomain_install ) )
</ins><span class="cx"> $sitemeta['illegal_names'][] = 'blog';
</span><span class="cx">
</span><span class="cx"> $insert = '';
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/includes/template.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -2837,7 +2837,7 @@
</span><span class="cx">
</span><span class="cx"> $hidden = get_hidden_meta_boxes($page);
</span><span class="cx">
</span><del>- printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
</del><ins>+ printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
</ins><span class="cx">
</span><span class="cx"> $i = 0;
</span><span class="cx"> do {
</span><span class="lines">@@ -3233,7 +3233,7 @@
</span><span class="cx"> */
</span><span class="cx"> function manage_columns_prefs( $page ) {
</span><span class="cx"> $columns = get_column_headers( $page );
</span><del>- $hidden = get_hidden_columns( $page );
</del><ins>+ $hidden = get_hidden_columns( $page );
</ins><span class="cx"> $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
</span><span class="cx">
</span><span class="cx"> foreach ( $columns as $column => $title ) {
</span><span class="lines">@@ -3545,9 +3545,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Convert a screen string to a screen object
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $screen The name of the screen
</span><span class="cx"> * @return object An object containing the safe screen name and id
</span><span class="cx"> */
</span><span class="lines">@@ -3615,11 +3615,11 @@
</span><span class="cx"> echo screen_layout($screen);
</span><span class="cx">
</span><span class="cx"> if ( !empty( $screen_options ) ) {
</span><del>- ?>
</del><ins>+ ?>
</ins><span class="cx"> <h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> echo $screen_options;
</span><span class="cx"> echo $settings; ?>
</span><span class="cx"> <div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
</span></span></pre></div>
<a id="trunkwpadminindexextraphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index-extra.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index-extra.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/index-extra.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> case 'dashboard_plugins' :
</span><span class="cx"> wp_dashboard_plugins_output();
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'dashboard_quick_press' :
</span><span class="cx"> wp_dashboard_quick_press_output();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/js/nav-menu.dev.js 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> },
</span><span class="cx"> getItemData : function( itemType, id ) {
</span><span class="cx"> itemType = itemType || 'menu-item';
</span><del>-
</del><ins>+
</ins><span class="cx"> var itemData = {}, i,
</span><span class="cx"> fields = [
</span><span class="cx"> 'menu-item-db-id',
</span><span class="lines">@@ -164,13 +164,13 @@
</span><span class="cx"> 'menu-item-classes',
</span><span class="cx"> 'menu-item-xfn'
</span><span class="cx"> ];
</span><del>-
</del><ins>+
</ins><span class="cx"> if( !id && itemType == 'menu-item' ) {
</span><span class="cx"> id = this.find('.menu-item-data-db-id').val();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if( !id ) return itemData;
</span><del>-
</del><ins>+
</ins><span class="cx"> this.find('input').each(function() {
</span><span class="cx"> var field;
</span><span class="cx"> i = fields.length;
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> field = fields[i] + '[' + id + ']';
</span><span class="cx"> else if( itemType == 'add-menu-item' )
</span><span class="cx"> field = 'menu-item[' + id + '][' + fields[i] + ']';
</span><del>-
</del><ins>+
</ins><span class="cx"> if (
</span><span class="cx"> this.name &&
</span><span class="cx"> field == this.name
</span><span class="lines">@@ -188,18 +188,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> return itemData;
</span><span class="cx"> },
</span><span class="cx"> setItemData : function( itemData, itemType, id ) { // Can take a type, such as 'menu-item', or an id.
</span><span class="cx"> itemType = itemType || 'menu-item';
</span><del>-
</del><ins>+
</ins><span class="cx"> if( !id && itemType == 'menu-item' ) {
</span><span class="cx"> id = $('.menu-item-data-db-id', this).val();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if( !id ) return this;
</span><del>-
</del><ins>+
</ins><span class="cx"> this.find('input').each(function() {
</span><span class="cx"> var t = $(this), field;
</span><span class="cx"> $.each( itemData, function( attr, val ) {
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> field = attr + '[' + id + ']';
</span><span class="cx"> else if( itemType == 'add-menu-item' )
</span><span class="cx"> field = 'menu-item[' + id + '][' + attr + ']';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( field == t.attr('name') ) {
</span><span class="cx"> t.val( val );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/nav-menus.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -83,14 +83,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // get next in order
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
</span><span class="cx"> ) {
</span><span class="cx"> $next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
</span><span class="cx"> $next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
</span><span class="cx">
</span><span class="cx"> // if not siblings of same parent, bubble menu item up but keep order
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> ! empty( $menu_item_data['menu_item_parent'] ) &&
</span><span class="cx"> (
</span><span class="cx"> empty( $next_item_data['menu_item_parent'] ) ||
</span><span class="lines">@@ -99,12 +99,12 @@
</span><span class="cx"> ) {
</span><span class="cx">
</span><span class="cx"> $parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> $parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
</span><span class="cx">
</span><span class="cx"> if ( ! is_wp_error( $parent_object ) ) {
</span><span class="cx"> $parent_data = (array) $parent_object;
</span><del>- $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</del><ins>+ $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</ins><span class="cx"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -114,16 +114,16 @@
</span><span class="cx"> $next_item_data['menu_order'] = $next_item_data['menu_order'] - 1;
</span><span class="cx"> $menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
</span><span class="cx">
</span><del>- $menu_item_data['menu_item_parent'] = $next_item_data['ID'];
</del><ins>+ $menu_item_data['menu_item_parent'] = $next_item_data['ID'];
</ins><span class="cx"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_update_post($menu_item_data);
</span><span class="cx"> wp_update_post($next_item_data);
</span><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> // the item is last but still has a parent, so bubble up
</span><del>- } elseif (
</del><ins>+ } elseif (
</ins><span class="cx"> ! empty( $menu_item_data['menu_item_parent'] ) &&
</span><span class="cx"> in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
</span><span class="cx"> ) {
</span><span class="lines">@@ -174,16 +174,16 @@
</span><span class="cx"> $parent_data = (array) $parent_object;
</span><span class="cx">
</span><span class="cx"> // if there is something before the parent and parent a child of it, make menu item a child also of it
</span><del>- if (
- ! empty( $dbids_to_orders[$parent_db_id] ) &&
</del><ins>+ if (
+ ! empty( $dbids_to_orders[$parent_db_id] ) &&
</ins><span class="cx"> ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
</span><span class="cx"> ! empty( $parent_data['menu_item_parent'] )
</span><span class="cx"> ) {
</span><span class="cx"> $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</span><span class="cx">
</span><span class="cx"> // else if there is something before parent and parent not a child of it, make menu item a child of that something's parent
</span><del>- } elseif (
- ! empty( $dbids_to_orders[$parent_db_id] ) &&
</del><ins>+ } elseif (
+ ! empty( $dbids_to_orders[$parent_db_id] ) &&
</ins><span class="cx"> ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
</span><span class="cx"> ) {
</span><span class="cx"> $_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
</span><span class="lines">@@ -210,12 +210,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // else this menu item is not a child of the previous
</span><del>- } elseif (
</del><ins>+ } elseif (
</ins><span class="cx"> empty( $menu_item_data['menu_order'] ) ||
</span><span class="cx"> empty( $menu_item_data['menu_item_parent'] ) ||
</span><span class="cx"> ! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
</span><span class="cx"> empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
</span><del>- $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
</del><ins>+ $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
</ins><span class="cx"> ) {
</span><span class="cx"> // just make it a child of the previous; keep the order
</span><span class="cx"> $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> $auto_add = true;
</span><span class="cx"> else
</span><span class="cx"> $auto_add = false;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="auto-add-pages">
</span><span class="cx"> <label class="howto"><input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" value="1" /> <?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/network.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
</span><span class="cx"> // Uh oh:
</span><span class="cx"> if ( !allow_subdirectory_install() )
</span><del>- echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</del><ins>+ echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
</ins><span class="cx"> ?></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php elseif ( !allow_subdirectory_install() ) : ?>
</span><span class="lines">@@ -348,9 +348,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </li>
</span><span class="cx"> <?php
</span><del>- if (iis7_supports_permalinks()) {
</del><ins>+ if (iis7_supports_permalinks()) {
</ins><span class="cx"> if (is_subdomain_install()) {
</span><del>- $web_config_file =
</del><ins>+ $web_config_file =
</ins><span class="cx"> '<?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <configuration>
</span><span class="cx"> <system.webServer>
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> </system.webServer>
</span><span class="cx"> </configuration>';
</span><span class="cx"> } else {
</span><del>- $web_config_file =
</del><ins>+ $web_config_file =
</ins><span class="cx"> '<?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <configuration>
</span><span class="cx"> <system.webServer>
</span><span class="lines">@@ -438,24 +438,24 @@
</span><span class="cx">
</span><span class="cx"> # uploaded files
</span><span class="cx"> RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! $subdomain_install )
</span><span class="cx"> $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> $htaccess_file .= "\n" . 'RewriteCond %{REQUEST_FILENAME} -f [OR]
</span><span class="cx"> RewriteCond %{REQUEST_FILENAME} -d
</span><span class="cx"> RewriteRule ^ - [L]';
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo custom content dir.
</span><span class="cx"> if ( ! $subdomain_install )
</span><span class="cx"> $htaccess_file .= "\nRewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]\nRewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]";
</span><del>-
</del><ins>+
</ins><span class="cx"> $htaccess_file .= "\nRewriteRule . index.php [L]";
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
</span><del>- <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $subdomain_install ? 11 : 16; ?>"><?php
- echo wp_htmledit_pre( $htaccess_file );
</del><ins>+ <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $subdomain_install ? 11 : 16; ?>"><?php
+ echo wp_htmledit_pre( $htaccess_file );
</ins><span class="cx"> ?>
</span><span class="cx"> </textarea></li>
</span><span class="cx"> </ol>
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-admin/upload.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> wp_die( __('You are not allowed to scan for lost attachments.') );
</span><span class="cx">
</span><span class="cx"> $lost = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent > '0' and post_parent NOT IN ( SELECT ID FROM $wpdb->posts WHERE post_type NOT IN ('attachment', '" . join("', '", get_post_types( array( 'public' => false ) ) ) . "') )");
</span><del>-
</del><ins>+
</ins><span class="cx"> $_GET['detached'] = 1;
</span><span class="cx">
</span><span class="cx"> } elseif ( isset($_GET['found_post_id']) && isset($_GET['media']) ) {
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> '<p>' . __('You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.') . '</p>' .
</span><span class="cx"> '<p>' . __('Hovering over a row reveals action links: <em>Edit</em>, <em>Delete Permanently</em>, and <em>View</em>. Clicking <em>Edit</em> or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking <em>Delete Permanently</em> will delete the file from the media library (as well as from any posts to which it is currently attached). <em>View</em> will take you to the display page for that file. ') . '</p>' .
</span><span class="cx"> '<p>' . __('If a media file has not been attached to any post, you will see that in the <em>Attached To</em> column, and can click on <em>Attach File</em> to launch a small popup that will allow you to search for a post and attach the file.') . '</p>' .
</span><del>- '<p>' . __('For more information:<br />
</del><ins>+ '<p>' . __('For more information:<br />
</ins><span class="cx"> <a href="http://codex.wordpress.org/Media_Library_SubPanel">Media Library Documentation</a> <br />
</span><span class="cx"> <a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/default-constants.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Slug of the default theme for this install.
</span><span class="cx"> * Used as the default theme when installing new sites.
</span><del>- * Will be used as the fallback if the current theme doesn't exist.
</del><ins>+ * Will be used as the fallback if the current theme doesn't exist.
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> if ( !defined('WP_DEFAULT_THEME') )
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/default-widgets.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -624,12 +624,12 @@
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="cx"> global $comments, $comment;
</span><del>-
</del><ins>+
</ins><span class="cx"> $cache = wp_cache_get('widget_recent_comments', 'widget');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! is_array( $cache ) )
</span><span class="cx"> $cache = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $cache[$args['widget_id']] ) ) {
</span><span class="cx"> echo $cache[$args['widget_id']];
</span><span class="cx"> return;
</span><span class="lines">@@ -646,11 +646,11 @@
</span><span class="cx">
</span><span class="cx"> $comments = get_comments( array( 'number' => $number, 'status' => 'approve' ) );
</span><span class="cx"> $output .= $before_widget;
</span><del>- if ( $title )
</del><ins>+ if ( $title )
</ins><span class="cx"> $output .= $before_title . $title . $after_title;
</span><span class="cx">
</span><span class="cx"> $output .= '<ul id="recentcomments">';
</span><del>- if ( $comments ) {
</del><ins>+ if ( $comments ) {
</ins><span class="cx"> foreach ( (array) $comments as $comment) {
</span><span class="cx"> $output .= '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . esc_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/l10n.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Displays translated string with gettext context
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @see _x
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="lines">@@ -506,13 +506,13 @@
</span><span class="cx"> * @return array Array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
</span><span class="cx"> */
</span><span class="cx"> function get_available_languages( $dir = null ) {
</span><del>- $languages = array();
-
</del><ins>+ $languages = array();
+
</ins><span class="cx"> foreach( (array)glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ) as $lang_file ) {
</span><span class="cx"> if ( false === strpos( $lang_file, 'continents-cities' ) ) {
</span><span class="cx"> $languages[] = basename($lang_file, '.mo');
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $languages;
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/link-template.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -586,11 +586,11 @@
</span><span class="cx"> */
</span><span class="cx"> function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
</span><span class="cx"> global $wp_rewrite;
</span><del>-
</del><ins>+
</ins><span class="cx"> $term_id = ( int ) $term_id;
</span><span class="cx">
</span><span class="cx"> $term = get_term( $term_id, $taxonomy );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $term ) || is_wp_error( $term ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -601,10 +601,10 @@
</span><span class="cx">
</span><span class="cx"> if ( '' == $permalink_structure ) {
</span><span class="cx"> if ( 'category' == $taxonomy ) {
</span><del>- $link = home_url("?feed=$feed&amp;cat=$term_id");
</del><ins>+ $link = home_url("?feed=$feed&amp;cat=$term_id");
</ins><span class="cx"> }
</span><span class="cx"> elseif ( 'post_tag' == $taxonomy ) {
</span><del>- $link = home_url("?feed=$feed&amp;tag=$term->slug");
</del><ins>+ $link = home_url("?feed=$feed&amp;tag=$term->slug");
</ins><span class="cx"> } else {
</span><span class="cx"> $t = get_taxonomy( $taxonomy );
</span><span class="cx"> $link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
</span><span class="lines">@@ -625,8 +625,8 @@
</span><span class="cx"> $link = apply_filters( 'category_feed_link', $link, $feed );
</span><span class="cx"> else
</span><span class="cx"> $link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> return $link;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2185,7 +2185,7 @@
</span><span class="cx"> $post_id = $wp_query->get_queried_object_id();
</span><span class="cx"> } elseif ( 'post' == $context ) {
</span><span class="cx"> $post = get_post($id);
</span><del>- $post_id = $post->ID;
</del><ins>+ $post_id = $post->ID;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $shortlink = '';
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-constants.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-constants.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/ms-default-constants.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> function ms_subdomain_constants() {
</span><span class="cx"> static $error = null;
</span><span class="cx"> static $error_warn = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( false === $error )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> } elseif ( defined( 'VHOST' ) ) {
</span><span class="cx"> $error = true;
</span><span class="cx"> define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx"> define( 'SUBDOMAIN_INSTALL', false );
</span><span class="cx"> define( 'VHOST', 'no' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/nav-menu-template.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> $sorted_menu_items = array();
</span><span class="cx"> foreach ( (array) $menu_items as $key => $menu_item )
</span><span class="cx"> $sorted_menu_items[$menu_item->menu_order] = $menu_item;
</span><del>-
</del><ins>+
</ins><span class="cx"> unset($menu_items);
</span><span class="cx">
</span><span class="cx"> $items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> $active_parent_object_ids = array();
</span><span class="cx"> $possible_object_parents = array();
</span><span class="cx"> $home_page_id = (int) get_option( 'page_for_posts' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $wp_query->is_singular && ! empty( $queried_object->post_type ) && ! is_post_type_hierarchical( $queried_object->post_type ) ) {
</span><span class="cx"> foreach ( (array) get_object_taxonomies( $queried_object->post_type ) as $taxonomy ) {
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) ) {
</span><span class="lines">@@ -328,15 +328,15 @@
</span><span class="cx"> $active_parent_object_ids[] = (int) $menu_item->object_id;
</span><span class="cx"> $active_parent_item_ids[] = (int) $menu_item->db_id;
</span><span class="cx"> $active_object = $queried_object->post_type;
</span><del>-
</del><ins>+
</ins><span class="cx"> // if the menu item corresponds to the currently-queried post or taxonomy object
</span><span class="cx"> } elseif (
</span><span class="cx"> $menu_item->object_id == $queried_object_id &&
</span><del>- (
</del><ins>+ (
</ins><span class="cx"> ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && $wp_query->is_home && $home_page_id = $menu_item->object_id ) ||
</span><span class="cx"> ( 'post_type' == $menu_item->type && $wp_query->is_singular ) ||
</span><del>- ( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) )
- )
</del><ins>+ ( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) )
+ )
</ins><span class="cx"> ) {
</span><span class="cx"> $menu_items[$key]->classes = trim( $menu_item->classes . ' ' . 'current-menu-item' );
</span><span class="cx"> $active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
</span><span class="lines">@@ -363,11 +363,11 @@
</span><span class="cx">
</span><span class="cx"> // set parent's class
</span><span class="cx"> foreach ( (array) $menu_items as $key => $parent_item ) {
</span><del>- if (
- isset( $parent_item->type ) &&
- 'post_type' == $parent_item->type &&
</del><ins>+ if (
+ isset( $parent_item->type ) &&
+ 'post_type' == $parent_item->type &&
</ins><span class="cx"> ! empty( $queried_object->post_type ) &&
</span><del>- is_post_type_hierarchical( $queried_object->post_type ) &&
</del><ins>+ is_post_type_hierarchical( $queried_object->post_type ) &&
</ins><span class="cx"> in_array( $parent_item->object_id, $queried_object->ancestors )
</span><span class="cx"> )
</span><span class="cx"> $menu_items[$key]->classes = trim( $parent_item->classes . ' ' . 'current-' . $queried_object->post_type . '-ancestor current-menu-ancestor' );
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/nav-menu.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> 'menu-item-object' => $post->post_type,
</span><span class="cx"> 'menu-item-type' => 'post_type',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $auto_add as $menu_id ) {
</span><span class="cx"> $items = (array) wp_get_nav_menu_items( $menu_id );
</span><span class="cx"> foreach ( $items as $item ) {
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/pluggable.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -105,11 +105,11 @@
</span><span class="cx">
</span><span class="cx"> if ( ! is_numeric( $user_id ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $user_id = absint( $user_id );
</span><span class="cx"> if ( ! $user_id )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $user = wp_cache_get( $user_id, 'users' );
</span><span class="cx">
</span><span class="cx"> if ( $user )
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/plugin.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $function = (array) $function;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (is_object($function[0]) ) {
</span><span class="cx"> // Object Class Calling
</span><span class="cx"> if ( function_exists('spl_object_hash') ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/post.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -783,13 +783,13 @@
</span><span class="cx"> * - register_meta_box_cb - Provide a callback function that will be called when setting up the meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
</span><span class="cx"> * - taxonomies - An array of taxonomy identifiers that will be registered for the post type. Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or register_taxonomy_for_object_type().
</span><span class="cx"> * - labels - An array of labels for this post type. You can see accepted values in {@link get_post_type_labels()}. By default post labels are used for non-hierarchical types and page labels for hierarchical ones.
</span><del>- * - permalink_epmask - The default rewrite endpoint bitmasks.
</del><ins>+ * - permalink_epmask - The default rewrite endpoint bitmasks.
</ins><span class="cx"> * - rewrite - false to prevent rewrite, or array('slug'=>$slug) to customize permastruct; default will use $taxonomy as slug.
</span><span class="cx"> * - query_var - false to prevent queries, or string to value of the query var to use for this post type
</span><span class="cx"> * - can_export - true allows this post type to be exported.
</span><del>- * - show_in_nav_menus - true makes this post type available for selection in navigation menus.
</del><ins>+ * - show_in_nav_menus - true makes this post type available for selection in navigation menus.
</ins><span class="cx"> * - _builtin - true if this post type is a native or "built-in" post_type. THIS IS FOR INTERNAL USE ONLY!
</span><del>- * - _edit_link - URL segement to use for edit link of this post type. Set to 'post.php?post=%d'. THIS IS FOR INTERNAL USE ONLY!
</del><ins>+ * - _edit_link - URL segement to use for edit link of this post type. Set to 'post.php?post=%d'. THIS IS FOR INTERNAL USE ONLY!
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @uses $wp_post_types Inserts new post type object into the list
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds an object with all post type capabilities out of a post type object
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Accepted keys of the capabilities array in the post type object:
</span><span class="cx"> * - edit_post - The meta capability that controls editing a particular object of this post type. Defaults to "edit_$capability_type" (edit_post).
</span><span class="cx"> * - edit_posts - The capability that controls editing objects of this post type as a class. Defaults to "edit_ . $capability_type . s" (edit_posts).
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> * - read_post - The meta capability that controls reading a particular object of this post type. Defaults to "read_$capability_type" (read_post).
</span><span class="cx"> * - read_private_posts - The capability that controls reading private posts. Defaults to "read_ . $capability_type . s" (read_private_posts).
</span><span class="cx"> * - delete_post - The meta capability that controls deleting a particular object of this post type. Defaults to "delete_$capability_type" (delete_post).
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param object $args
</span><span class="cx"> * @return object object with all the capabilities as member variables
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds an object with all post type labels out of a post type object
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Accepted keys of the label array in the post type object:
</span><span class="cx"> * - name - general name for the post type, usually plural. The same and overriden by $post_type_object->label. Default is Posts/Pages
</span><span class="cx"> * - singular_name - name for one object of this post type. Default is Post/Page
</span><span class="lines">@@ -932,9 +932,9 @@
</span><span class="cx"> * - not_found - Default is No posts found/No pages found
</span><span class="cx"> * - not_found_in_trash - Default is No posts found in Trash/No pages found in Trash
</span><span class="cx"> * - parent_item_colon - This string isn't used on non-hierarchical types. In hierarchical ones the default is Parent Page:
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Above, the first default value is for non-hierarchical post types (like posts) and the second one is for hierarchical post types (like pages.)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param object $post_type_object
</span><span class="cx"> * @return object object with all the labels as member variables
</span><span class="lines">@@ -958,22 +958,22 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds an object with custom-something object (post type, taxonomy) labels out of a custom-something object
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access private
</span><span class="cx"> */
</span><span class="cx"> function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $object->label ) ) {
</span><span class="cx"> $object->labels['name'] = $object->label;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
</span><span class="cx"> $object->labels['singular_name'] = $object->labels['name'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $defaults = array_map( create_function( '$x', $object->hierarchical? 'return $x[1];' : 'return $x[0];' ), $nohier_vs_hier_defaults );
</span><span class="cx"> $labels = array_merge( $defaults, $object->labels );
</span><del>- return (object)$labels;
</del><ins>+ return (object)$labels;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/query.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1864,7 +1864,7 @@
</span><span class="cx"> $search .= " AND ($wpdb->posts.post_password = '') ";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Allow plugins to contextually add/remove/modify the search section of the database query
</span><span class="cx"> $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/rewrite.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1775,7 +1775,7 @@
</span><span class="cx"> <rules>
</span><span class="cx"> ';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $rules .= '
</span><span class="cx"> <rule name="wordpress" patternSyntax="Wildcard">
</span><span class="cx"> <match url="*" />
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/taxonomy.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> * whether taxonomy exists.
</span><span class="cx"> *
</span><span class="cx"> * Optional $args contents:
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * label - Name of the taxonomy shown in the menu. Usually plural. If not set, labels['name'] will be used.
</span><span class="cx"> *
</span><span class="cx"> * hierarchical - has some defined purpose at other parts of the API and is a
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> *
</span><span class="cx"> * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
</span><span class="cx"> * defaults to show_ui which defalts to public.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * labels - An array of labels for this taxonomy. You can see accepted values in {@link get_taxonomy_labels()}. By default tag labels are used for non-hierarchical types and category labels for hierarchical ones.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> $args['labels'] = get_taxonomy_labels( (object) $args );
</span><span class="cx"> $args['label'] = $args['labels']->name;
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_taxonomies[$taxonomy] = (object) $args;
</span><span class="cx">
</span><span class="cx"> // register callback handling for metabox
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Builds an object with all taxonomy labels out of a taxonomy object
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Accepted keys of the label array in the taxonomy object:
</span><span class="cx"> * - name - general name for the taxonomy, usually plural. The same as and overriden by $tax->label. Default is Post Tags/Categories
</span><span class="cx"> * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
</span><span class="lines">@@ -325,9 +325,9 @@
</span><span class="cx"> * - update_item - Default is Update Tag/Update Category
</span><span class="cx"> * - add_new_item - Default is Add New Tag/Add New Category
</span><span class="cx"> * - new_item_name - Default is New Tag Name/New Category Name
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories.)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param object $tax Taxonomy object
</span><span class="cx"> * @return object object with all the labels as member variables
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-includes/theme.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -1716,7 +1716,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Checks an attachment being deleted to see if it's a header or background image.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * If true it removes the theme modification which would be pointing at the deleted
</span><span class="cx"> * attachment
</span><span class="cx"> *
</span><span class="lines">@@ -1728,7 +1728,7 @@
</span><span class="cx"> $attachment_image = wp_get_attachment_url( $id );
</span><span class="cx"> $header_image = get_header_image();
</span><span class="cx"> $background_image = get_background_image();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $header_image && $header_image == $attachment_image )
</span><span class="cx"> remove_theme_mod( 'header_image' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpmailphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-mail.php (14923 => 14924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-mail.php 2010-05-26 02:38:31 UTC (rev 14923)
+++ trunk/wp-mail.php 2010-05-26 02:42:15 UTC (rev 14924)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx">
</span><span class="cx"> $pop3 = new POP3();
</span><span class="cx">
</span><del>-if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
</del><ins>+if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
</ins><span class="cx"> wp_die( esc_html( $pop3->ERROR ) );
</span><span class="cx">
</span><span class="cx"> $count = $pop3->pass( get_option('mailserver_pass') );
</span><span class="cx">
</span><del>-if( false === $count )
</del><ins>+if( false === $count )
</ins><span class="cx"> wp_die( esc_html( $pop3->ERROR ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if( 0 === $count ) {
</span><span class="cx"> $pop3->quit();
</span><span class="cx"> wp_die( __('There doesn&#8217;t seem to be any new mail.') );
</span></span></pre>
</div>
</div>
</body>
</html>