<!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>[13733] trunk: Trim trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13733">13733</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-03-17 16:27:25 +0000 (Wed, 17 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trim trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadmincssinstalldevcss">trunk/wp-admin/css/install.dev.css</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.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="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjsinlineeditpostdevjs">trunk/wp-admin/js/inline-edit-post.dev.js</a></li>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</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="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.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="#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="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/admin-header.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -35,15 +35,15 @@
</span><span class="cx"> //<![CDATA[
</span><span class="cx"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx"> var userSettings = {
</span><del>- 'url': '<?php echo SITECOOKIEPATH; ?>',
</del><ins>+ 'url': '<?php echo SITECOOKIEPATH; ?>',
</ins><span class="cx"> 'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
</span><span class="cx"> 'time':'<?php echo time() ?>'
</span><span class="cx"> },
</span><del>- ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
- pagenow = '<?php echo $current_screen->id; ?>',
- typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
- adminpage = '<?php echo $admin_body_class; ?>',
- thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
</del><ins>+ ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+ pagenow = '<?php echo $current_screen->id; ?>',
+ typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+ adminpage = '<?php echo $admin_body_class; ?>',
+ thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
</ins><span class="cx"> decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
</span><span class="cx"> //]]>
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkwpadmincssinstalldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install.dev.css (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install.dev.css 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/css/install.dev.css 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> margin: 6px 0 14px 0;
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> text-align:center
</span><del>-}
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> .step {
</span><span class="cx"> margin: 20px 0 15px;
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/edit-tags.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php elseif ( 'post_tag' == $taxonomy ) : ?>
</span><span class="cx"> <div class="form-wrap">
</span><del>-<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p>
</del><ins>+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'admin.php?import=wp-cat2tag&amp;step=3') ;?>.</p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif;
</span><span class="cx"> do_action('after-' . $taxonomy . '-table', $taxonomy);
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/export.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> $months = "";
</span><span class="cx"> for ( $i = 1; $i < 13; $i++ ) {
</span><del>- $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
</del><ins>+ $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
</ins><span class="cx"> $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n";
</span><span class="cx"> } ?>
</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 (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> function error($error) {
</span><span class="cx"> if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
</span><span class="cx"> $this->error = $this->upgrader->strings[$error];
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_wp_error($error) && $error->get_error_code() ) {
</span><span class="cx"> foreach ( $error->get_error_messages() as $emessage ) {
</span><span class="cx"> if ( $error->get_error_data() )
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/export.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -38,28 +38,28 @@
</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><span class="cx">
</span><del>-if ( $post_type and $post_type != 'all' ) {
- $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
-} else {
- $where = "WHERE post_type != 'revision' ";
-}
-if ( $author and $author != 'all' ) {
- $author_id = (int) $author;
- $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
-}
-if ( $start_date and $start_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
-}
-if ( $end_date and $end_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
-}
-if ( $category and $category != 'all' ) {
- $taxomony_id = (int) $category;
- $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
-}
-if ( $status and $status != 'all' ) {
- $where .= $wpdb->prepare("AND post_status = %s ", $status);
-}
</del><ins>+if ( $post_type and $post_type != 'all' ) {
+ $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
+} else {
+ $where = "WHERE post_type != 'revision' ";
+}
+if ( $author and $author != 'all' ) {
+ $author_id = (int) $author;
+ $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
+}
+if ( $start_date and $start_date != 'all' ) {
+ $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
+}
+if ( $end_date and $end_date != 'all' ) {
+ $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
+}
+if ( $category and $category != 'all' ) {
+ $taxomony_id = (int) $category;
+ $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
+}
+if ( $status and $status != 'all' ) {
+ $where .= $wpdb->prepare("AND post_status = %s ", $status);
+}
</ins><span class="cx">
</span><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></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/file.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> // A writable uploads dir will pass this test. Again, there's no point overriding this one.
</span><span class="cx"> if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
</span><del>- return call_user_func($upload_error_handler, $file, $uploads['error'] );
</del><ins>+ return call_user_func($upload_error_handler, $file, $uploads['error'] );
</ins><span class="cx">
</span><span class="cx"> $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/misc.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -656,15 +656,15 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Send a HTTP header to disable content type sniffing in browsers which support it.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @link http://blogs.msdn.com/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx
</span><span class="cx"> * @link http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0.
</span><span class="cx"> * @return none
</span><span class="cx"> */
</span><span class="cx"> function send_nosniff_header() {
</span><del>- @header( 'X-Content-Type-Options: nosniff' );
</del><ins>+ @header( 'X-Content-Type-Options: nosniff' );
</ins><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Display the default admin color scheme picker (Used in user-edit.php)
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/ms.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> global $current_user;
</span><span class="cx"> if ( !is_array( $users ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> screen_icon('tools');
</span><span class="cx"> ?>
</span><span class="cx"> <h2><?php esc_html_e('Users'); ?></h2>
</span><span class="lines">@@ -183,13 +183,13 @@
</span><span class="cx"> foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
</span><span class="cx"> if ( $val != '' && $val != '0' ) {
</span><span class="cx"> $delete_user = new WP_User( $val );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( in_array( $delete_user->user_login, $site_admins ) )
</span><span class="cx"> wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
</span><span class="cx"> $blogs = get_blogs_of_user( $val, true );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $blogs ) ) {
</span><span class="cx"> echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';
</span><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/nav-menu.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_post_type_metaboxes() {
</span><span class="cx"> $post_types = get_post_types( array( 'public' => true ), 'object' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$post_types )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -99,10 +99,10 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_item_link_metabox() {
</span><span class="cx"> $args = array( 'post_status' => 'any', 'post_type' => 'nav_menu_item', 'meta_value' => 'custom', 'showposts' => -1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo transient caching of these results with proper invalidation on updating links
</span><span class="cx"> $query = new WP_Query( $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <p id="menu-item-url-wrap">
</span><span class="cx"> <label class="howto" for="menu-item-url">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> <input id="custom-menu-item-name" name="custom-menu-item-name" type="text" class="regular-text menu-item-textbox" value="<?php echo esc_attr( __('Menu Item') ); ?>" />
</span><span class="cx"> </label>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="lines">@@ -146,16 +146,16 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_nav_menu_item_post_type_metabox( $object, $post_type ) {
</span><span class="cx"> $args = array( 'post_type' => $post_type['args']->name, 'post_status' => 'publish', 'showposts' => -1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'attachment' == $post_type['args']->name )
</span><span class="cx"> $args['post_status'] = 'any';
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo transient caching of these results with proper invalidation on updating of a post of this type
</span><span class="cx"> $query = new WP_Query( $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$query->posts )
</span><span class="cx"> $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $post_type['args']->label ) .'</li>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $pt_names = '';
</span><span class="cx"> if ( is_array($query->posts) ) {
</span><span class="cx"> foreach ( $query->posts as $post ) {
</span><span class="lines">@@ -166,19 +166,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $id = $post_type['args']->name;
</span><span class="cx"> ?>
</span><span class="cx"> <p class="quick-search-wrap">
</span><span class="cx"> <input type="text" class="quick-search regular-text" value="" />
</span><span class="cx"> <a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
</span><span class="cx"> <div class="list-container">
</span><span class="cx"> <ul class="list">
</span><span class="lines">@@ -218,10 +218,10 @@
</span><span class="cx">
</span><span class="cx"> // @todo transient caching of these results with proper invalidation on updating of a tax of this type
</span><span class="cx"> $terms = get_terms( $taxonomy['args']->name, $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$terms )
</span><span class="cx"> $error = '<li id="error">'. sprintf( __( 'No %s exists' ), $taxonomy['args']->label ) .'</li>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $term_names = '';
</span><span class="cx"> if ( is_array($terms) ) {
</span><span class="cx"> foreach ( $terms as $term ) {
</span><span class="lines">@@ -232,19 +232,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $id = $taxonomy['args']->name;
</span><span class="cx"> ?>
</span><span class="cx"> <p class="quick-search-wrap">
</span><span class="cx"> <input type="text" class="quick-search regular-text" value="" />
</span><span class="cx"> <a class="quick-search-submit button-secondary"><?php _e('Search'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="button-controls">
</span><span class="cx"> <a class="show-all"><?php _e('View All'); ?></a>
</span><span class="cx"> <a class="hide-all"><?php _e('Hide All'); ?></a>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="existing-<?php echo esc_attr( $id ); ?>" class="list-wrap">
</span><span class="cx"> <div class="list-container">
</span><span class="cx"> <ul class="list">
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $context = 'frontend' ) {
</span><span class="cx"> if ( !$menu_items )
</span><span class="cx"> return __( 'Not Found' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $output = '';
</span><span class="cx"> $i = 1;
</span><span class="cx"> foreach ( $menu_items as $menu_item ) {
</span><span class="lines">@@ -289,16 +289,16 @@
</span><span class="cx"> // so we don't have to duplicate this entire function.
</span><span class="cx"> if ( !isset($menu_item->post_parent) )
</span><span class="cx"> $menu_item->post_parent = $menu_item->parent;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Cleanest way to get all attachements
</span><span class="cx"> if ( 'attachment' == $object )
</span><span class="cx"> $menu_item->post_parent = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 0 == $menu_item->post_parent ) {
</span><span class="cx"> // Set up the menu item
</span><del>- $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
</del><ins>+ $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
</ins><span class="cx"> $attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $output .= '<li'. $attributes .'>';
</span><span class="cx"> $output .= wp_get_nav_menu_item( $menu_item, $object_type, $object );
</span><span class="cx"> $output .= wp_get_nav_menu_sub_items( $menu_item->ID, $object_type, $object, $context );
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> ++$i;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $output;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $context = 'frontend' ) {
</span><span class="cx"> $args = array( 'child_of' => $childof, 'parent' => $childof, 'hide_empty' => false, );
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ( $object_type ) {
</span><span class="cx"> case 'post_type':
</span><span class="cx"> $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> $sub_menu_items = array();
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'taxonomy':
</span><span class="cx"> if ( is_taxonomy_hierarchical( $object ) ) {
</span><span class="cx"> $sub_menu_items = get_terms( $object, $args );
</span><span class="lines">@@ -342,12 +342,12 @@
</span><span class="cx"> $sub_menu_items = array();
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> default:
</span><span class="cx"> $sub_menu_items = array();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $output = '';
</span><span class="cx"> $i = 1;
</span><span class="cx"> if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/plugin.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $plugins
</span><span class="cx"> * @param string $redirect Redirect to page after successful activation.
</span><del>- * @param bool $network_wide Whether to enable the plugin for all sites in the network.
</del><ins>+ * @param bool $network_wide Whether to enable the plugin for all sites in the network.
</ins><span class="cx"> * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
</span><span class="cx"> */
</span><span class="cx"> function activate_plugins($plugins, $redirect = '', $network_wide) {
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/post.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> else
</span><span class="cx"> unset($post_data['post_category']);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $tax_input = array();
</span><span class="cx"> if ( isset($post_data['tax_input'])) {
</span><span class="cx"> foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> $taxonomy = get_taxonomy( $tax_name );
</span><span class="cx"> if ( $taxonomy->hierarchical )
</span><del>- $tax_input[$tax_name] = array_map( 'absint', $terms );
</del><ins>+ $tax_input[$tax_name] = array_map( 'absint', $terms );
</ins><span class="cx"> else {
</span><span class="cx"> $tax_input[$tax_name] = preg_replace( '/\s*,\s*/', ',', rtrim( trim($terms), ' ,' ) );
</span><span class="cx"> $tax_input[$tax_name] = explode(',', $tax_input[$tax_name]);
</span><span class="lines">@@ -314,14 +314,14 @@
</span><span class="cx"> $locked[] = $post_ID;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $tax_names = get_object_taxonomies( get_post($post_ID) );
</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 class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $tax_names as $tax_name ) {
</span><span class="cx"> if( isset( $tax_input[$tax_name]) ) {
</span><span class="cx"> $taxonomy = get_taxonomy( $tax_name );
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/template.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -862,15 +862,15 @@
</span><span class="cx"> $flat_taxonomies = array();
</span><span class="cx"> foreach ( $taxonomy_names as $taxonomy_name ) {
</span><span class="cx"> $taxonomy = get_taxonomy( $taxonomy_name);
</span><del>-
</del><ins>+
</ins><span class="cx"> if( !$taxonomy->show_ui ) continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> if( $taxonomy->hierarchical )
</span><span class="cx"> $hierarchical_taxonomies[] = $taxonomy;
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> $flat_taxonomies[] = $taxonomy;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $columns = wp_manage_posts_columns($screen);
</span><span class="cx"> $hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
</span><span class="cx"> $col_count = count($columns) - count($hidden);
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> <?php if ( count($hierarchical_taxonomies) && !$bulk ) : ?>
</span><span class="cx">
</span><span class="cx"> <fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
</span><span class="cx">
</span><span class="cx"> <span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->label) ?>
</span><span class="lines">@@ -2973,7 +2973,7 @@
</span><span class="cx"> * @global $wp_settings_sections Storage array of all settings sections added to admin pages
</span><span class="cx">
</span><span class="cx"> * @param string $id Slug-name to identify the section. Used in the 'id' attribute of tags.
</span><del>- * @param string $title Formatted title of the section. Shown as the heading for the section.
</del><ins>+ * @param string $title Formatted title of the section. Shown as the heading for the section.
</ins><span class="cx"> * @param string $callback Function that echo's out content for the section heading.
</span><span class="cx"> * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
</span><span class="cx"> */
</span><span class="lines">@@ -2999,7 +2999,7 @@
</span><span class="cx"> *
</span><span class="cx"> * The $callback argument should be the name of a function that echoes out the
</span><span class="cx"> * html input tags for this setting field. Use get_option() to retrive existing
</span><del>- * values to show.
</del><ins>+ * values to show.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="lines">@@ -3102,7 +3102,7 @@
</span><span class="cx"> * page is first accessed.
</span><span class="cx"> *
</span><span class="cx"> * @global array $wp_settings_errors Storage array of errors registered during this pageload
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $setting Slug title of the setting to which this error applies
</span><span class="cx"> * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
</span><span class="cx"> * @param string $message The formatted message text to display to the user (will be shown inside styled <div> and <p>)
</span><span class="lines">@@ -3129,7 +3129,7 @@
</span><span class="cx"> * Checks the $wp_settings_errors array for any errors declared during the current
</span><span class="cx"> * pageload and returns them.
</span><span class="cx"> *
</span><del>- * If changes were just submitted ($_GET['updated']) and settings errors were saved
</del><ins>+ * If changes were just submitted ($_GET['updated']) and settings errors were saved
</ins><span class="cx"> * to the 'settings_errors' transient then those errors will be returned instead. This
</span><span class="cx"> * is used to pass errors back across pageloads.
</span><span class="cx"> *
</span><span class="lines">@@ -3177,7 +3177,7 @@
</span><span class="cx"> * Display settings errors registered by add_settings_error()
</span><span class="cx"> *
</span><span class="cx"> * Part of the Settings API. Outputs a <div> for each error retrieved by get_settings_errors().
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This is called automatically after a settings page based on the Settings API is submitted.
</span><span class="cx"> * Errors should be added during the validation callback function for a setting defined in register_setting()
</span><span class="cx"> *
</span><span class="lines">@@ -3300,12 +3300,12 @@
</span><span class="cx"> */
</span><span class="cx"> function favorite_actions( $screen = null ) {
</span><span class="cx"> global $post_type_object;
</span><del>-
</del><ins>+
</ins><span class="cx"> $default_action = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset($post_type_object) ) {
</span><span class="cx"> switch ( $screen->id ) {
</span><span class="cx"> case $post_type_object->name:
</span><span class="lines">@@ -3316,7 +3316,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$default_action ) {
</span><span class="cx"> switch ( $screen->id ) {
</span><span class="cx"> case 'upload':
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/includes/upgrade.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -265,8 +265,8 @@
</span><span class="cx"> 'post_content_filtered' => ''
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- // Setup default widgets for default theme.
- update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
</del><ins>+ // Setup default widgets for default theme.
+ update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
</ins><span class="cx"> update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
</span><span class="cx"> update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
</span><span class="cx"> update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $wp_current_db_version < 12751 ) {
</span><span class="cx"> populate_roles_300();
</span><del>- if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
</del><ins>+ if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
</ins><span class="cx"> add_site_option( 'siteurl', '' );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/js/common.dev.js 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -289,13 +289,13 @@
</span><span class="cx"> el.selectionStart = el.selectionEnd = selStart + 1;
</span><span class="cx"> this.scrollTop = scroll;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( e.stopPropagation )
</span><span class="cx"> e.stopPropagation();
</span><span class="cx"> if ( e.preventDefault )
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#newcontent').blur(function(e) {
</span><span class="cx"> if ( this.lastKey && 9 == this.lastKey )
</span><span class="cx"> this.focus();
</span></span></pre></div>
<a id="trunkwpadminjsinlineeditpostdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/inline-edit-post.dev.js (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/inline-edit-post.dev.js 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/js/inline-edit-post.dev.js 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -158,8 +158,8 @@
</span><span class="cx"> $('textarea.tax_input_'+taxname, editRow).suggest( 'admin-ajax.php?action=ajax-tag-search&tax='+taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: ", " } );
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> // handle the post status
</span><span class="cx"> status = $('._status', rowData).text();
</span><span class="cx"> if ( status != 'future' ) $('select[name="_status"] option[value="future"]', editRow).remove();
</span></span></pre></div>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/js/nav-menu.dev.js 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> var item_description = jQuery('#menu-item-description' + id).val();
</span><span class="cx"> var item_classes = jQuery('#menu-item-classes' + id).val();
</span><span class="cx"> var item_xfn = jQuery('#menu-item-xfn' + id).val();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Only allow custom links to be editable.
</span><span class="cx"> if ( 'custom' != item_type )
</span><span class="cx"> jQuery( '#edit-menu-item-url' ).attr('disabled', 'disabled' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Populate the fields for thickbox
</span><span class="cx"> jQuery( '#edit-menu-item-id' ).val(id);
</span><span class="cx"> jQuery( '#edit-menu-item-title' ).val(item_title);
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> jQuery( '#edit-menu-item-description' ).val(item_description);
</span><span class="cx"> jQuery( '#edit-menu-item-classes' ).val(item_classes);
</span><span class="cx"> jQuery( '#edit-menu-item-xfn' ).val(item_xfn);
</span><del>-
</del><ins>+
</ins><span class="cx"> // focus
</span><span class="cx"> jQuery( '#edit-menu-item-title' ).focus();
</span><span class="cx"> };
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> var item_description = jQuery('#edit-menu-item-description').val();
</span><span class="cx"> var item_classes = jQuery('#edit-menu-item-classes').val();
</span><span class="cx"> var item_xfn = jQuery('#edit-menu-item-xfn').val();
</span><del>-
</del><ins>+
</ins><span class="cx"> // update menu item settings
</span><span class="cx"> jQuery('.menu #menu-item' + id).find('span.item-title').html(item_title);
</span><span class="cx"> jQuery('.menu #menu-item-title' + id).val(item_title);
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> jQuery('.menu #menu-item-description' + id).val(item_description);
</span><span class="cx"> jQuery('.menu #menu-item-classes' + id).val(item_classes);
</span><span class="cx"> jQuery('.menu #menu-item-xfn' + id).val(item_xfn);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('.menu #menu-item' + id + ' dt:first').animate( { backgroundColor: '#FFFF33' }, { duration: 'normal', complete: function() { jQuery(this).css( 'backgroundColor', '' ); }});
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_remove_menu_item( o ) {
</span><span class="cx"> var todelete = document.getElementById('menu-item' + o);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( todelete ) {
</span><span class="cx"> // Give some feedback to the user
</span><span class="cx"> jQuery( todelete ).find('dt').each(function(){
</span><span class="lines">@@ -114,16 +114,16 @@
</span><span class="cx"> function wp_add_item_to_menu( item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn ) {
</span><span class="cx"> var randomnumber = wp_get_unique_menu_id();
</span><span class="cx"> var hidden = wp_get_hidden_inputs( randomnumber, item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Adds the item in the queue
</span><span class="cx"> jQuery('.menu').append('<li id="menu-item' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="item-title">' + item_title + '</span><span class="item-controls"><span class="item-type">' + item_append + '</span><a class="item-edit thickbox" id="edit' + randomnumber + '" value="' + randomnumber +'" onClick="wp_edit_menu_item('+ randomnumber +')" title="' + navMenuL10n.thickbox + '" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">' + navMenuL10n.edit + '</a> | <a class="item-delete" id="delete' + randomnumber + '" value="' + randomnumber +'">Delete</a></span></dt></dl>' + hidden + '</li>');
</span><del>-
</del><ins>+
</ins><span class="cx"> // Give some feedback to the user
</span><span class="cx"> jQuery( '.menu #menu-item' + randomnumber + ' dt:first' ).animate( { backgroundColor: '#FFFF33' }, { duration: 'normal', complete: function() { jQuery(this).css( 'backgroundColor', '' ); }});
</span><del>-
</del><ins>+
</ins><span class="cx"> // Enable drag-n-drop
</span><span class="cx"> wp_drag_and_drop();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Reload thickbox
</span><span class="cx"> tb_init('a.thickbox, area.thickbox, input.thickbox');
</span><span class="cx"> };
</span><span class="lines">@@ -136,15 +136,15 @@
</span><span class="cx"> function wp_add_checked_items_to_menu( button ) {
</span><span class="cx"> // Grab checked items
</span><span class="cx"> var items = jQuery(button).siblings('.list-wrap').find(':checked');
</span><del>-
</del><ins>+
</ins><span class="cx"> // If nothing was checked, cancel
</span><span class="cx"> if ( 0 == items.length )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Loop through each item, grab it's hidden data and add it to the menu.
</span><span class="cx"> jQuery(items).each(function(){
</span><span class="cx"> var item_type = jQuery(this).parent().siblings('.menu-item-type').val();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'custom' == item_type ) {
</span><span class="cx"> var item_attr_title = jQuery(this).parent().siblings('.menu-item-attr-title').val();
</span><span class="cx"> var item_target = jQuery(this).parent().siblings('.menu-item-target').val();
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> var item_classes = '';
</span><span class="cx"> var item_xfn = '';
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> var item_db_id = jQuery(this).parent().siblings('.menu-item-db-id').val();
</span><span class="cx"> var item_object_id = jQuery(this).parent().siblings('.menu-item-object-id').val();
</span><span class="cx"> var item_append = jQuery(this).parent().siblings('.menu-item-append').val();
</span><span class="lines">@@ -164,14 +164,14 @@
</span><span class="cx"> var item_title = jQuery(this).parent().siblings('.menu-item-title').val();
</span><span class="cx"> var item_url = jQuery(this).parent().siblings('.menu-item-url').val();
</span><span class="cx"> var item_description = jQuery(this).parent().siblings('.menu-item-description').val();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( undefined == item_description ) {
</span><span class="cx"> item_description = '';
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add the menu item to the menu
</span><span class="cx"> wp_add_item_to_menu( item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn );
</span><del>-
</del><ins>+
</ins><span class="cx"> // uncheck the menu item in the list
</span><span class="cx"> jQuery(this).attr( 'checked', false );
</span><span class="cx"> });
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> drop: function(e, ui) {
</span><span class="cx"> var li = jQuery(this).parent();
</span><span class="cx"> var child = !jQuery(this).hasClass('dropzone');
</span><del>-
</del><ins>+
</ins><span class="cx"> // Append UL to first child
</span><span class="cx"> if ( child && li.children('ul').length == 0 ) {
</span><span class="cx"> li.append( '<ul class="sub-menu" />' );
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> var draggablevalue = ui.draggable.attr('value');
</span><span class="cx"> var droppablevalue = li.attr('value');
</span><del>-
</del><ins>+
</ins><span class="cx"> li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</span><span class="cx"> jQuery(this).parent().find('dt').removeAttr('style');
</span><span class="cx"> jQuery(this).parent().find('div:first').removeAttr('style');
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_update_post_data() {
</span><span class="cx"> var i = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('.menu li').each(function(i) {
</span><span class="cx"> i = i + 1;
</span><span class="cx"> var j = jQuery(this).attr('value');
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> jQuery(this).find('#menu-item-position' + j).attr('value', i);
</span><span class="cx"> jQuery(this).attr('id','menu-item' + i);
</span><span class="cx"> jQuery(this).attr('value', i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#menu-item-db-id' + j).attr('id','menu-item-db-id' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-object-id' + j).attr('id','menu-item-object-id' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-append' + j).attr('id', 'menu-item-append' + i);
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> p = 0;
</span><span class="cx"> }
</span><span class="cx"> jQuery(this).find('#menu-item-parent-id' + j).attr('value', p);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#menu-item-title' + j).attr('id','menu-item-title' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-url' + j).attr('id','menu-item-url' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-description' + j).attr('id','menu-item-description' + i);
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> jQuery(this).find('#menu-item-description' + j).attr('id','menu-item-description' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-attr-title' + j).attr('id','menu-item-attr-title' + i);
</span><span class="cx"> jQuery(this).find('#menu-item-target' + j).attr('id','menu-item-target' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#li-count').attr( 'value', i );
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Returns all the nessecary hidden inputs for each menu item.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string item_db_id - The menu item's db id.
</span><span class="cx"> * @param string item_object_id - The menu item's object id.
</span><span class="cx"> * @param string item_type - The menu item's object type.
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_get_hidden_inputs( randomnumber, item_db_id, item_object_id, item_type, item_append, item_parent_id, item_title, item_url, item_description, item_attr_title, item_target, item_classes, item_xfn ) {
</span><span class="cx"> var hidden = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> hidden += '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id' + randomnumber + '" value="' + item_db_id + '" />';
</span><span class="cx"> hidden += '<input type="hidden" name="menu-item-object-id[]" id="menu-item-object-id' + randomnumber + '" value="' + item_object_id + '" />';
</span><span class="cx"> hidden += '<input type="hidden" name="menu-item-type[]" id="menu-item-type' + randomnumber + '" value="' + item_type + '" />';
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> hidden += '<input type="hidden" name="menu-item-description[]" id="menu-item-description' + randomnumber + '" value="' + item_description + '" />';
</span><span class="cx"> hidden += '<input type="hidden" name="menu-item-classes[]" id="menu-item-classes' + randomnumber + '" value="' + item_classes + '" />';
</span><span class="cx"> hidden += '<input type="hidden" name="menu-item-xfn[]" id="menu-item-xfn' + randomnumber + '" value="' + item_xfn + '" />';
</span><del>-
</del><ins>+
</ins><span class="cx"> return hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -369,9 +369,9 @@
</span><span class="cx"> * Init Functions
</span><span class="cx"> */
</span><span class="cx"> jQuery(document).ready(function($){
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_drag_and_drop();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Delete AYS
</span><span class="cx"> $('#update-nav-menu .deletion').click(function(){
</span><span class="cx"> if ( confirm( navMenuL10n.warnDelete ) ) {
</span><span class="lines">@@ -380,49 +380,49 @@
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Handle Save Button Clicks
</span><span class="cx"> $('#save_menu').click(function(){
</span><span class="cx"> return wp_update_post_data();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // close postboxes that should be closed
</span><span class="cx"> $('.if-js-closed').removeClass('if-js-closed').addClass('closed');
</span><del>-
</del><ins>+
</ins><span class="cx"> // postboxes setup
</span><span class="cx"> postboxes.add_postbox_toggles('menus');
</span><del>-
</del><ins>+
</ins><span class="cx"> // Clear the quick search textbox
</span><span class="cx"> $('.quick-search').click(function(){
</span><span class="cx"> $(this).attr( 'value', '' );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Quick Search submit
</span><span class="cx"> $('.quick-search-submit').click(function(){
</span><span class="cx"> $(this).siblings('.quick-search').search();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Edit menu item
</span><span class="cx"> $('#menu-container .item-edit').click(function(){
</span><span class="cx"> return wp_edit_menu_item( $(this).attr('value') );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Delete menu item
</span><span class="cx"> $('#menu-container .item-delete').live( 'click', function(e){
</span><span class="cx"> return wp_remove_menu_item( $(this).attr('value') );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Update menu item settings (thickbox)
</span><span class="cx"> $('#update-menu-item').click(function(){
</span><span class="cx"> wp_update_menu_item();
</span><span class="cx"> return tb_remove();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Close thickbox
</span><span class="cx"> $('#cancel-save').click(function(){
</span><span class="cx"> return tb_remove();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Show All Button
</span><span class="cx"> $('.show-all').click(function(e){
</span><span class="cx"> jQuery(e.currentTarget).parent().siblings('.list-wrap').css( 'display', 'block' );
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> jQuery(e.currentTarget).hide();
</span><span class="cx"> jQuery(e.currentTarget).siblings('.hide-all').show();
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Hide All Button
</span><span class="cx"> $('.hide-all').click(function(e){
</span><span class="cx"> jQuery(e.currentTarget).parent().siblings('.list-wrap').css( 'display', 'none' );
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> $('#add-custom-links .add-to-menu a').click(function(e){
</span><span class="cx"> var link_url = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-url').val();
</span><span class="cx"> var link_name = jQuery(e.currentTarget).parent().parent().find('#custom-menu-item-name').val();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add link to menu
</span><span class="cx"> wp_add_item_to_menu( 0, '', 'custom', navMenuL10n.custom, 0, link_name, link_url, '', '', '_self', '', '' );
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/menu.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> $submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_super_admin() ) {
</span><span class="cx"> $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
</span><span class="cx"> $update_plugins = get_site_transient( 'update_plugins' );
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
</span><span class="cx"> $_wp_last_object_menu++;
</span><span class="cx"> $ptype_obj = get_post_type_object($ptype);
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu[$_wp_last_object_menu] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-posts', 'menu-' . sanitize_html_class($ptype), 'div');
</span><span class="cx"> $submenu["edit.php?post_type=$ptype"][5] = array( __('Edit'), 'edit_posts', "edit.php?post_type=$ptype");
</span><span class="cx"> /* translators: add new custom post type */
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/ms-edit.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $id != '0' && $id != $current_site->blog_id )
</span><span class="cx"> wpmu_delete_blog( $id, true );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'delete'), $_POST[ 'ref' ] ) );
</span><span class="cx"> exit();
</span><span class="cx"> break;
</span><span class="lines">@@ -342,8 +342,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> wp_die( __('You are not allowed to change one of these sites.') );
</span><span class="cx"> exit();
</span><del>- };
- };
</del><ins>+ };
+ };
</ins><span class="cx">
</span><span class="cx"> wp_redirect( add_query_arg( array('updated' => 'true', 'action' => $blogfunction), $_SERVER['HTTP_REFERER'] ) );
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/ms-sites.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> reset($blogusers);
</span><span class="cx"> foreach ( (array) $blogusers as $key => $val ) {
</span><span class="cx"> if ( isset( $val->meta_value ) && ! $val->meta_value )
</span><del>- continue;
</del><ins>+ continue;
</ins><span class="cx"> $t = @unserialize( $val->meta_value );
</span><span class="cx"> if ( is_array( $t ) ) {
</span><span class="cx"> reset( $t );
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> $per_page = apply_filters( 'ms_sites_per_page', $per_page );
</span><span class="cx">
</span><span class="cx"> $s = isset($_GET['s']) ? stripslashes( trim( $_GET[ 's' ] ) ) : '';
</span><del>- $like_s = esc_sql( like_escape( $s ) );
</del><ins>+ $like_s = esc_sql( like_escape( $s ) );
</ins><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
</span><span class="cx">
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> $status_links = array();
</span><span class="cx"> $status_class = '';
</span><span class="cx"> $count = get_blog_count();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($_GET['blogstatus']) || $_GET['blogstatus'] == 'all' )
</span><span class="cx"> $status_class = ' class="current"';
</span><span class="cx">
</span><span class="lines">@@ -474,12 +474,12 @@
</span><span class="cx"> <?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
</span><span class="cx"> number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
</span><span class="cx"> number_format_i18n( min( $pagenum * $per_page, $num_pages ) ),
</span><del>- number_format_i18n( $num_pages ),
</del><ins>+ number_format_i18n( $num_pages ),
</ins><span class="cx"> $page_links
</span><span class="cx"> ); echo $page_links_text; ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php } ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="view-switch">
</span><span class="cx"> <a href="<?php echo esc_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
</span><span class="cx"> <a href="<?php echo esc_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="<?php echo esc_url( includes_url( 'images/blank.gif' ) ); ?>" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="clear"></div>
</del><ins>+ <div class="clear"></div>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> // define the columns to display, the syntax is 'internal name' => 'display name'
</span><span class="lines">@@ -539,14 +539,14 @@
</span><span class="cx"> $order2 = '';
</span><span class="cx"> if ( $order_by == $column_id )
</span><span class="cx"> $order2 = ($order == 'DESC') ? 'ASC' : 'DESC';
</span><del>-
</del><ins>+
</ins><span class="cx"> $column_link .= esc_url(add_query_arg( array('order' => $order2, 'paged' => $pagenum, 'sortby' => $column_id ), remove_query_arg( array('action', 'updated'), $_SERVER['REQUEST_URI'] ) ) );
</span><span class="cx"> $column_link .= "'>{$column_display_name}</a>";
</span><span class="cx"> $col_url = ($column_id == 'users' || $column_id == 'plugins') ? $column_display_name : $column_link;
</span><span class="cx"> ?>
</span><span class="cx"> <th scope="col">
</span><span class="cx"> <?php echo $col_url ?>
</span><del>- </th>
</del><ins>+ </th>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> </tr>
</span><span class="cx"> </tfoot>
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> else
</span><span class="cx"> $date = 'Y/m/d \<\b\r \/\> g:i:s a';
</span><span class="cx"> echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __("Never") : mysql2date( __( $date ), $blog['last_updated'] ); ?>
</span><del>- </td>
</del><ins>+ </td>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 'registered': ?>
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/ms-users.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <td class="username column-username">
</span><span class="cx"> <?php echo $avatar; ?><strong><a href="<?php echo $edit; ?>" class="edit"><?php echo stripslashes($user['user_login']); ?></a><?php
</span><del>- if ( in_array( $user[ 'user_login' ], $super_admins ) )
</del><ins>+ if ( in_array( $user[ 'user_login' ], $super_admins ) )
</ins><span class="cx"> echo ' - ' . __( 'Super admin' );
</span><span class="cx"> ?></strong>
</span><span class="cx"> <br/>
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/nav-menus.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx"> $nav_menu_selected_id = 0;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'update':
</span><span class="cx"> check_admin_referer( 'update-nav_menu' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add Menu
</span><span class="cx"> if ( isset($_POST['create-menu']) ) {
</span><span class="cx"> if ( current_theme_supports('nav-menus') ) {
</span><span class="lines">@@ -91,15 +91,15 @@
</span><span class="cx"> $args = array( 'name' => $_POST['menu-name'], 'slug' => null, 'description' => $old_nav_menu['description'], 'parent' => $old_nav_menu['parent'], );
</span><span class="cx"> $new_nav_menu = wp_update_term( $nav_menu_selected_id, 'nav_menu', $args );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Update menu items
</span><span class="cx"> $update_nav_items = isset( $_POST['li-count'] ) ? (int) $_POST['li-count'] : 0;
</span><span class="cx"> $update_nav_menu = is_nav_menu( $nav_menu_selected_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !is_wp_error($update_nav_menu) ) {
</span><span class="cx"> $menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID') );
</span><span class="cx"> $parent_menu_ids = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Loop through all POST variables
</span><span class="cx"> for ( $k = 0; $k < $update_nav_items; $k++ ) {
</span><span class="cx"> $menu_item_db_id = isset( $_POST['menu-item-db-id'][$k] ) ? $_POST['menu-item-db-id'][$k] : 0;
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> $menu_item_position = isset( $_POST['menu-item-position'][$k] ) ? $_POST['menu-item-position'][$k] : 0;
</span><span class="cx"> $menu_item_type = isset( $_POST['menu-item-type'][$k] ) ? $_POST['menu-item-type'][$k] : 'custom';
</span><span class="cx"> $menu_item_append = isset( $_POST['menu-item-append'][$k] ) ? $_POST['menu-item-append'][$k] : 'custom';
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item_title = isset( $_POST['menu-item-title'][$k] ) ? $_POST['menu-item-title'][$k] : '';
</span><span class="cx"> $menu_item_url = isset( $_POST['menu-item-url'][$k] ) ? $_POST['menu-item-url'][$k] : '';
</span><span class="cx"> $menu_item_description = isset( $_POST['menu-item-description'][$k] ) ? $_POST['menu-item-description'][$k]: '';
</span><span class="lines">@@ -116,11 +116,11 @@
</span><span class="cx"> $menu_item_target = isset( $_POST['menu-item-target'][$k] ) ? $_POST['menu-item-target'][$k] : 0;
</span><span class="cx"> $menu_item_classes = isset( $_POST['menu-item-classes'][$k] ) ? $_POST['menu-item-classes'][$k] : '';
</span><span class="cx"> $menu_item_xfn = isset( $_POST['menu-item-xfn'][$k] ) ? $_POST['menu-item-xfn'][$k] : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Menu item title can't be blank
</span><span class="cx"> if ( '' == $menu_item_title )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Populate the menu item
</span><span class="cx"> $post = array( 'post_status' => 'publish', 'post_type' => 'nav_menu_item', 'post_author' => $user_ID,
</span><span class="cx"> 'ping_status' => 0, 'post_parent' => $menu_item_parent_id, 'menu_order' => $menu_item_position,
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> unset( $menu_items[$menu_item_db_id] );
</span><span class="cx"> }
</span><span class="cx"> $parent_menu_ids[$k] = $menu_item_db_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo sanitize type append and ID.
</span><span class="cx"> update_post_meta( $menu_item_db_id, 'menu_item_type', $menu_item_type );
</span><span class="cx"> update_post_meta( $menu_item_db_id, 'menu_item_append', $menu_item_append );
</span><span class="lines">@@ -145,11 +145,11 @@
</span><span class="cx"> // @todo handle sanitizing multiple classes separated by whitespace.
</span><span class="cx"> update_post_meta( $menu_item_db_id, 'menu_item_classes', sanitize_html_class($menu_item_classes) );
</span><span class="cx"> update_post_meta( $menu_item_db_id, 'menu_item_xfn', sanitize_html_class($menu_item_xfn) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo: only save custom link urls.
</span><span class="cx"> update_post_meta( $menu_item_db_id, 'menu_item_url', esc_url_raw( $menu_item_url ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Remove menu items from the menu that weren't in $_POST
</span><span class="cx"> if ( !empty( $menu_items ) ) {
</span><span class="cx"> foreach ( array_keys( $menu_items ) as $menu_item_id ) {
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> // Else try to grab the first menu from the menus list
</span><span class="cx"> } elseif ( 0 == $nav_menu_selected_id && ! empty($nav_menus) ) {
</span><del>- $nav_menu_selected_id = $nav_menus[0]->term_id;
</del><ins>+ $nav_menu_selected_id = $nav_menus[0]->term_id;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update the user's setting
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( $nav_menus as $_nav_menu ) {
</span><span class="cx"> $sep = end( $nav_menus ) == $_nav_menu ? '' : ' | ';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $nav_menu_selected_id == $_nav_menu->term_id )
</span><span class="cx"> echo '<li><a href="'. admin_url( 'nav-menus.php?action=edit&amp;menu=' . esc_attr($_nav_menu->term_id) ) .'" class="current">'. esc_html( $_nav_menu->name ) .'</a>'. $sep .'</li>';
</span><span class="cx"> else
</span><span class="lines">@@ -232,16 +232,16 @@
</span><span class="cx"> <input type="hidden" name="action" value="update" />
</span><span class="cx"> <input type="hidden" name="li-count" id="li-count" value="0" />
</span><span class="cx"> <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="post-body">
</span><span class="cx"> <div id="post-body-content">
</span><span class="cx"> <?php if ( is_nav_menu($nav_menu_selected_id) ) : ?>
</span><span class="cx"> <div id="menu-container" class="postbox">
</span><span class="cx"> <h3 class="hndle"><?php echo esc_html( $nav_menu_selected_title ); ?></h3>
</span><span class="cx"> <div class="inside">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php echo wp_get_nav_menu( array( 'context' => 'backend', 'menu' => $nav_menu_selected_id ) ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div><!-- /.inside -->
</span><span class="cx"> <!-- /#nav-menu-canvas .postbox-->
</span><span class="cx"> </div>
</span><span class="lines">@@ -252,9 +252,9 @@
</span><span class="cx"> </div><!-- /#post-body-content-->
</span><span class="cx"> </div><!--- /#post-body -->
</span><span class="cx"> <div id="menu-settings-column" class="inner-sidebar">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php do_meta_boxes( 'menus', 'side', null ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div><!-- /#menu-settings-column -->
</span><span class="cx"> </form><!--/#update-nav-menu-->
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/network.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> echo "\ndefine( '$c', '$v' );";
</span><span class="cx"> }
</span><span class="cx"> ?></textarea>
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </li>
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/options.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('manage_options') )
</span><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() && !is_super_admin() && 'update' != $action )
</span><span class="cx"> wp_die(__('Cheatin&#8217; uh?'));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/plugins.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -96,21 +96,21 @@
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'update-selected' :
</span><del>-
</del><ins>+
</ins><span class="cx"> check_admin_referer( 'bulk-manage-plugins' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $_GET['plugins'] ) )
</span><span class="cx"> $plugins = explode( ',', $_GET['plugins'] );
</span><span class="cx"> elseif ( isset( $_POST['checked'] ) )
</span><span class="cx"> $plugins = (array) $_POST['checked'];
</span><span class="cx"> else
</span><span class="cx"> $plugins = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> $title = __( 'Upgrade Plugins' );
</span><span class="cx"> $parent_file = 'plugins.php';
</span><span class="cx">
</span><span class="cx"> require_once( 'admin-header.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon();
</span><span class="cx"> echo '<h2>' . esc_html( $title ) . '</h2>';
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/tools.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -90,13 +90,13 @@
</span><span class="cx"> $cats = get_taxonomy('category');
</span><span class="cx"> $tags = get_taxonomy('post_tag');
</span><span class="cx">
</span><del>-if ( current_user_can($cats->manage_cap) || current_user_can($tags->manage_cap) ) : ?>
-<div class="tool-box">
</del><ins>+if ( current_user_can($cats->manage_cap) || current_user_can($tags->manage_cap) ) : ?>
+<div class="tool-box">
</ins><span class="cx"> <h3 class="title"><?php _e('Category&#47;Tag Conversion') ?></h3>
</span><del>- <p><?php printf(__('Use this to convert <a href="%s">categories to tags</a>, or <a href="%s">tags to categories</a>.'), 'admin.php?import=wp-cat2tag', 'admin.php?import=wp-cat2tag&amp;step=3'); ?></p>
-</div>
</del><ins>+ <p><?php printf(__('Use this to convert <a href="%s">categories to tags</a>, or <a href="%s">tags to categories</a>.'), 'admin.php?import=wp-cat2tag', 'admin.php?import=wp-cat2tag&amp;step=3'); ?></p>
+</div>
</ins><span class="cx"> <?php
</span><del>-endif;
</del><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> do_action( 'tool_box' );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/update-core.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( (array) $themes as $stylesheet => $theme_data) {
</span><span class="cx"> $screenshot = $theme_data->{'Theme Root URI'} . '/' . $stylesheet . '/' . $theme_data->Screenshot;
</span><del>-
</del><ins>+
</ins><span class="cx"> echo "
</span><span class="cx"> <tr class='active'>
</span><span class="cx"> <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th>
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/update.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> $upgrader->bulk_upgrade( $plugins );
</span><span class="cx">
</span><span class="cx"> iframe_footer();
</span><del>-
</del><ins>+
</ins><span class="cx"> } elseif ( 'upgrade-plugin' == $action ) {
</span><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><span class="cx"> wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-admin/upload.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
</span><span class="cx"> echo esc_html( strtoupper( $matches[1] ) );
</span><span class="cx"> else
</span><del>- echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
</del><ins>+ echo strtoupper( str_replace( 'image/', '', get_post_mime_type() ) );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="row-actions">
</span></span></pre></div>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/default-filters.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> add_filter( $filter, 'esc_html' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Format titles
</del><ins>+// Format titles
</ins><span class="cx"> foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title' ) as $filter ) {
</span><span class="cx"> add_filter( $filter, 'wptexturize' );
</span><span class="cx"> add_filter( $filter, 'strip_tags' );
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/default-widgets.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _get_current_taxonomy($instance) {
</span><del>- if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )
</del><ins>+ if ( !empty($instance['taxonomy']) && is_taxonomy($instance['taxonomy']) )
</ins><span class="cx"> return $instance['taxonomy'];
</span><span class="cx">
</span><span class="cx"> return 'post_tag';
</span><span class="lines">@@ -1047,21 +1047,21 @@
</span><span class="cx"> $widget_ops = array( 'description' => __('Use this widget to add one of your navigation menus as a widget.') );
</span><span class="cx"> parent::WP_Widget( 'nav_menu', __('Navigation Menu'), $widget_ops );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function widget($args, $instance) {
</span><span class="cx"> // Get menu
</span><span class="cx"> $nav_menu = wp_get_nav_menu_object( $instance['nav_menu'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$nav_menu )
</span><del>- return;
-
</del><ins>+ return;
+
</ins><span class="cx"> echo $args['before_widget'];
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset($instance['title']) )
</span><span class="cx"> echo $args['before_title'] . $instance['title'] . $args['after_title'];
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_nav_menu( array( 'menu' => $nav_menu ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> echo $args['after_widget'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1074,10 +1074,10 @@
</span><span class="cx"> function form( $instance ) {
</span><span class="cx"> $title = isset( $instance['title'] ) ? $instance['title'] : '';
</span><span class="cx"> $nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get menus
</span><span class="cx"> $menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // If no menus exists, direct the user to go and create some.
</span><span class="cx"> if ( !$menus ) {
</span><span class="cx"> echo '<p>'. sprintf( __('No menus have been created yet. <a href="%s">Create some</a>.'), admin_url('nav-menus.php') ) .'</p>';
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/formatting.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -756,7 +756,7 @@
</span><span class="cx"> * Keys are used as internal identifiers. They should be lowercase ASCII. Dashes and underscores are allowed.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $key String key
</span><span class="cx"> * @return string Sanitized key
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/functions.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -1825,7 +1825,7 @@
</span><span class="cx"> if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
</span><span class="cx"> continue;
</span><span class="cx"> if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
</span><del>- continue;
</del><ins>+ continue;
</ins><span class="cx">
</span><span class="cx"> // If visiting repair.php, return true and let it take over.
</span><span class="cx"> if ( defined('WP_REPAIRING') )
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/l10n.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Unloads translations for a domain
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param string $domain Textdomain to be unloaded
</span><span class="cx"> * @return bool Whether textdomain was unloaded
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/link-template.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -2059,7 +2059,7 @@
</span><span class="cx"> * via the get_shortlink filter.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $id A post or blog id. Default is 0, which means the current post or blog.
</span><span class="cx"> * @param string $contex Whether the id is a 'blog' id, 'post' id, or 'media' id. If 'post', the post_type of the post is consulted. If 'query', the current query is consulted to determine the id and context. Default is 'post'.
</span><span class="cx"> * @param bool $allow_slugs Whether to allow post slugs in the shortlink. It is up to the plugin how and whether to honor this.
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/nav-menu-template.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -25,14 +25,14 @@
</span><span class="cx"> function wp_nav_menu( $args = array() ) {
</span><span class="cx"> $defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true,
</span><span class="cx"> 'fallback_cb' => 'wp_page_menu', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx"> $args = apply_filters( 'wp_nav_menu_args', $args );
</span><span class="cx"> $args = (object) $args;
</span><span class="cx">
</span><span class="cx"> // Get the nav menu
</span><span class="cx"> $menu = wp_get_nav_menu_object( $args->menu );
</span><del>-
</del><ins>+
</ins><span class="cx"> // If we couldn't find a menu based off the name, id or slug,
</span><span class="cx"> // get the first menu that has items.
</span><span class="cx"> if ( !$menu ) {
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'div' == $args->container ) {
</span><span class="cx"> $class = $args->container_class ? ' class="' . esc_attr($args->container_class) . '"' : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_nav_menu($menu) ) {
</span><span class="cx"> $nav_menu .= '<div id="menu-' . $menu->slug . '"'. $class .'>';
</span><span class="cx"> } else {
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'div' == $args->container )
</span><span class="cx"> $nav_menu .= '</div>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
</span><span class="cx">
</span><span class="cx"> if ( $args->echo )
</span><span class="lines">@@ -85,25 +85,25 @@
</span><span class="cx"> function wp_get_nav_menu( $args = array() ) {
</span><span class="cx"> $defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend',
</span><span class="cx"> 'fallback_cb' => '', 'before_link' => '', 'after_link' => '', 'before_title' => '', 'after_title' => '', );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx"> $args = apply_filters( 'wp_get_nav_menu_args', $args );
</span><span class="cx"> $args = (object) $args;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Variable setup
</span><span class="cx"> $nav_menu = '';
</span><span class="cx"> $items = '';
</span><span class="cx"> $current_parent = 0;
</span><span class="cx"> $parent_stack = array();
</span><span class="cx"> $parent_menu_order = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get the menu object
</span><span class="cx"> $menu = wp_get_nav_menu_object( $args->menu );
</span><del>-
</del><ins>+
</ins><span class="cx"> // If the menu exists, get it's items.
</span><span class="cx"> if ( $menu && !is_wp_error($menu) )
</span><span class="cx"> $menu_items = wp_get_nav_menu_items( $menu->term_id, 'backend' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // If no menu was found or if the menu has no items, call the fallback_cb
</span><span class="cx"> if ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) ) ) {
</span><span class="cx"> if ( function_exists($args->fallback_cb) ) {
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> return call_user_func( $args->fallback_cb, $_args );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $menu_items as $key => $menu_item ) {
</span><span class="cx"> // Set up the $menu_item variables
</span><span class="cx"> $menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
</span><span class="lines">@@ -119,10 +119,10 @@
</span><span class="cx"> $type = $menu_item->append;
</span><span class="cx"> $maybe_value = 'frontend' == $args->context ? '' : ' value="'. $menu_item->ID .'"';
</span><span class="cx"> $classes = 'frontend' == $args->context ? ' class="menu-item-type-'. $type . $menu_item->li_class .'"' : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $items .= '<li id="menu-item-'. $menu_item->ID .'"'. $maybe_value . $classes .'>';
</span><span class="cx"> $items .= wp_get_nav_menu_item( $menu_item, $args->context, $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Indent children
</span><span class="cx"> $last_item = ( count( $menu_items ) == $menu_item->menu_order );
</span><span class="cx"> if ( $last_item || $current_parent != $menu_items[$key + 1]->post_parent ) {
</span><span class="lines">@@ -141,11 +141,11 @@
</span><span class="cx"> $items .= '</li>';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // CSS class
</span><span class="cx"> $ul_class = $args->menu_class ? ' class="'. $args->menu_class .'"' : '';
</span><span class="cx"> $nav_menu .= '<ul'. $ul_class .'>';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Allow plugins to hook into the menu to add their own <li>'s
</span><span class="cx"> if ( 'frontend' == $args->context ) {
</span><span class="cx"> $items = apply_filters( 'wp_nav_menu_items', $items, $args );
</span><span class="lines">@@ -154,9 +154,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $nav_menu .= $items;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $nav_menu .= '</ul>';
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'wp_get_nav_menu', $nav_menu );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -179,15 +179,15 @@
</span><span class="cx"> $attributes .= ( isset($menu_item->classes) && '' != $menu_item->classes ) ? ' class="'. esc_attr($menu_item->classes) .'"' : '';
</span><span class="cx"> $attributes .= ( isset($menu_item->xfn) && '' != $menu_item->xfn ) ? ' rel="'. esc_attr($menu_item->xfn) .'"' : '';
</span><span class="cx"> $attributes .= ( isset($menu_item->url) && '' != $menu_item->url ) ? ' href="'. esc_attr($menu_item->url) .'"' : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $output .= esc_html( $args->before_link );
</span><span class="cx"> $output .= '<a'. $attributes .'>';
</span><span class="cx"> $output .= esc_html( $args->before_title . $menu_item->title . $args->after_title );
</span><span class="cx"> $output .= '</a>';
</span><span class="cx"> $output .= esc_html( $args->after_link );
</span><del>-
</del><ins>+
</ins><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'backend':
</span><span class="cx"> $output .= '<dl><dt>';
</span><span class="cx"> $output .= '<span class="item-title">'. esc_html($menu_item->title) .'</span>';
</span><span class="lines">@@ -204,13 +204,13 @@
</span><span class="cx"> $label = $menu_item->append;
</span><span class="cx"> }
</span><span class="cx"> $output .= '<span class="item-type">'. esc_html($label) .'</span>';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Actions
</span><span class="cx"> $output .= '<a class="item-edit thickbox" id="edit'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'" title="'. __('Edit Menu Item') .'" href="#TB_inline?height=540&width=300&inlineId=menu-item-settings">'. __('Edit') .'</a> | ';
</span><span class="cx"> $output .= '<a class="item-delete" id="delete'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->menu_order ) .'">'. __('Delete') .'</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $output .= '</dt></dl>';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Menu Item Settings
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-db-id[]" id="menu-item-db-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->ID ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-object-id[]" id="menu-item-object-id'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->object_id ) .'" />';
</span><span class="lines">@@ -226,11 +226,11 @@
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-attr-title[]" id="menu-item-attr-title'. esc_attr( $menu_item->menu_order ) .'" value="'.esc_attr( $menu_item->post_excerpt ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-target[]" id="menu-item-target'. esc_attr( $menu_item->menu_order ) .'" value="'. esc_attr( $menu_item->target ) .'" />';
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'custom':
</span><span class="cx"> $menu_id = 'menu-item-' . $menu_item->db_id;
</span><span class="cx"> $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Menu item hidden fields
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-db-id" value="'. esc_attr( $menu_item->db_id ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-object-id" value="'. esc_attr( $menu_item->object_id ) .'" />';
</span><span class="lines">@@ -245,12 +245,12 @@
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-classes" value="'. esc_attr( $menu_item->classes ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-xfn" value="'. esc_attr( $menu_item->xfn ) .'" />';
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'taxonomy':
</span><span class="cx"> case 'post_type':
</span><span class="cx"> $menu_id = 'menu-item-' . $menu_item->db_id;
</span><span class="cx"> $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( $menu_id ) .'" name="'. esc_attr( $menu_item->title ) .'" value="'. esc_attr( $menu_item->url ) .'" />'. $menu_item->title .'</label>';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Menu item hidden fields
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-db-id" value="0" />';
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-object-id" value="'. esc_attr( $menu_item->object_id ) .'" />';
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-append" value="'. esc_attr( $menu_item->append ) .'" />';
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $output;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/nav-menu.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -118,21 +118,21 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $menu menu name, id, or slug
</span><del>- * @param string $args
</del><ins>+ * @param string $args
</ins><span class="cx"> * @return mixed $items array of menu items, else false.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_nav_menu_items( $menu, $args = array() ) {
</span><span class="cx"> $menu = wp_get_nav_menu_object( $menu );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$menu )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $items = get_objects_in_term( $menu->term_id, 'nav_menu' );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $items ) ) {
</span><span class="cx"> $defaults = array( 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item', 'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order' );
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>- if ( count( $items ) > 1 )
</del><ins>+ if ( count( $items ) > 1 )
</ins><span class="cx"> $args['include'] = implode( ',', $items );
</span><span class="cx"> else
</span><span class="cx"> $args['include'] = $items[0];
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_setup_nav_menu_item( $menu_item, $menu_item_type = null, $menu_item_object = '' ) {
</span><span class="cx"> global $wp_query;
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ( $menu_item_type ) {
</span><span class="cx"> case 'frontend':
</span><span class="cx"> $menu_item->db_id = (int) $menu_item->ID;
</span><span class="lines">@@ -173,26 +173,26 @@
</span><span class="cx"> $menu_item->type = get_post_meta( $menu_item->ID, 'menu_item_type', true );
</span><span class="cx">
</span><span class="cx"> $menu_item->append = get_post_meta( $menu_item->ID, 'menu_item_append', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item->title = $menu_item->post_title;
</span><span class="cx"> $menu_item->url = get_post_meta( $menu_item->ID, 'menu_item_url', true );
</span><span class="cx"> $menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
</span><span class="cx"> $menu_item->description = strip_tags( $menu_item->post_content );
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );;
</span><span class="cx"> $menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
</span><span class="cx"> $menu_item->li_class = ( $menu_item->object_id == $wp_query->get_queried_object_id() ) ? ' current_page_item' : '';
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'custom':
</span><span class="cx"> $menu_item->db_id = (int) $menu_item->ID;
</span><span class="cx"> $menu_item->object_id = (int) $menu_item->ID;
</span><span class="cx"> $menu_item->parent_id = (int) $menu_item->post_parent;
</span><span class="cx"> $menu_item->type = 'custom'; //$menu_item_type
</span><span class="cx"> $menu_item->append = 'custom';
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item->attr_title = strip_tags( $menu_item->post_excerpt );
</span><span class="cx"> $menu_item->description = strip_tags( $menu_item->post_content );
</span><span class="cx">
</span><span class="lines">@@ -200,31 +200,31 @@
</span><span class="cx"> $menu_item->url = get_post_meta( $menu_item->ID, 'menu_item_url', true );
</span><span class="cx"> $menu_item->target = get_post_meta( $menu_item->ID, 'menu_item_target', true );
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'post_type':
</span><span class="cx"> $menu_item->db_id = 0;
</span><span class="cx"> $menu_item->object_id = (int) $menu_item->ID;
</span><span class="cx"> $menu_item->parent_id = (int) $menu_item->post_parent;
</span><span class="cx"> $menu_item->type = $menu_item_type;
</span><del>-
</del><ins>+
</ins><span class="cx"> $object = get_post_type_object( $menu_item_object );
</span><span class="cx"> $menu_item->append = $object->name;
</span><span class="cx">
</span><span class="cx"> $menu_item->title = $menu_item->post_title;
</span><span class="cx"> $menu_item->url = get_permalink( $menu_item->ID );
</span><span class="cx"> $menu_item->target = '_self';
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item->attr_title = '';
</span><span class="cx"> $menu_item->description = strip_tags( $menu_item->post_content );
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'taxonomy':
</span><span class="cx"> $menu_item->ID = $menu_item->term_id;
</span><span class="cx"> $menu_item->db_id = 0;
</span><span class="cx"> $menu_item->object_id = (int) $menu_item->term_id;
</span><span class="cx"> $menu_item->parent_id = (int) $menu_item->parent;
</span><span class="cx"> $menu_item->type = $menu_item_type;
</span><del>-
</del><ins>+
</ins><span class="cx"> $object = get_taxonomy( $menu_item_object );
</span><span class="cx"> $menu_item->append = $object->name;
</span><span class="cx">
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> $menu_item->classes = get_post_meta( $menu_item->ID, 'menu_item_classes', true );
</span><span class="cx"> $menu_item->xfn = get_post_meta( $menu_item->ID, 'menu_item_xfn', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $menu_item;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/pluggable.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> $list = implode(',', $clean);
</span><span class="cx">
</span><span class="cx"> $results = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
</span><del>-
</del><ins>+
</ins><span class="cx"> _fill_many_users($results);
</span><span class="cx"> }
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/post.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -2930,12 +2930,12 @@
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx"> $number = (int) $number;
</span><span class="cx"> $offset = (int) $offset;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make sure the post type is hierarchical
</span><span class="cx"> $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
</span><span class="cx"> if ( !in_array( $post_type, $hierarchical_post_types ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make sure we have a valid post status
</span><span class="cx"> if ( !in_array($post_status, get_post_stati()) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -3031,7 +3031,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $parent >= 0 )
</span><span class="cx"> $where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
</span><del>-
</del><ins>+
</ins><span class="cx"> $where_post_type = $wpdb->prepare( "post_type = '%s' AND post_status = '%s'", $post_type, $post_status );
</span><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
</span><span class="lines">@@ -3178,7 +3178,7 @@
</span><span class="cx"> $post_category = array( get_option('default_category') );
</span><span class="cx"> else
</span><span class="cx"> $post_category = array();
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Are we updating or creating?
</span><span class="cx"> if ( !empty($ID) ) {
</span><span class="lines">@@ -3814,7 +3814,7 @@
</span><span class="cx"> $lastpostmodified = wp_cache_get( "lastpostmodified:$timezone", 'timeinfo' );
</span><span class="cx"> if ( $lastpostmodified )
</span><span class="cx"> return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
</span><del>-
</del><ins>+
</ins><span class="cx"> switch ( strtolower($timezone) ) {
</span><span class="cx"> case 'gmt':
</span><span class="cx"> $lastpostmodified = $wpdb->get_var("SELECT post_modified_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1");
</span><span class="lines">@@ -3826,13 +3826,13 @@
</span><span class="cx"> $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type = 'post' ORDER BY post_modified_gmt DESC LIMIT 1");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $lastpostdate = get_lastpostdate($timezone);
</span><span class="cx"> if ( $lastpostdate > $lastpostmodified )
</span><span class="cx"> $lastpostmodified = $lastpostdate;
</span><span class="cx">
</span><del>- if ( $lastpostmodified )
- wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' );
</del><ins>+ if ( $lastpostmodified )
+ wp_cache_set( "lastpostmodified:$timezone", $lastpostmodified, 'timeinfo' );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/query.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -224,9 +224,9 @@
</span><span class="cx"> * Whether the current query is for the given taxonomy and/or term.
</span><span class="cx"> *
</span><span class="cx"> * If no taxonomy argument is set, returns true if any taxonomy is queried.
</span><del>- * If the taxonomy argument is passed but no term argument, returns true
</del><ins>+ * If the taxonomy argument is passed but no term argument, returns true
</ins><span class="cx"> * if the taxonomy or taxonomies in the argument are being queried.
</span><del>- * If both taxonomy and term arguments are passed, returns true
</del><ins>+ * If both taxonomy and term arguments are passed, returns true
</ins><span class="cx"> * if the current query is for a term contained in the terms argument
</span><span class="cx"> * which has a taxonomy contained in the taxonomy argument.
</span><span class="cx"> *
</span><span class="lines">@@ -253,9 +253,9 @@
</span><span class="cx"> if ( empty( $term ) ) // Only a Taxonomy provided
</span><span class="cx"> return isset($queried_object->taxonomy) && count( $tax_array ) && in_array($queried_object->taxonomy, $tax_array);
</span><span class="cx">
</span><del>- return isset($queried_object->term_id) &&
</del><ins>+ return isset($queried_object->term_id) &&
</ins><span class="cx"> count(array_intersect(
</span><del>- array($queried_object->term_id, $queried_object->name, $queried_object->slug),
</del><ins>+ array($queried_object->term_id, $queried_object->name, $queried_object->slug),
</ins><span class="cx"> $term_array
</span><span class="cx"> ));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/rewrite.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -1780,10 +1780,10 @@
</span><span class="cx"> } else {
</span><span class="cx"> $siteurl = get_option( 'siteurl' );
</span><span class="cx"> $siteurl_len = strlen( $siteurl );
</span><del>- if ( substr( WP_CONTENT_URL, 0, $siteurl_len ) == $siteurl && strlen( WP_CONTENT_URL ) > $siteurl_len )
</del><ins>+ if ( substr( WP_CONTENT_URL, 0, $siteurl_len ) == $siteurl && strlen( WP_CONTENT_URL ) > $siteurl_len )
</ins><span class="cx"> $content_path = substr( WP_CONTENT_URL, $siteurl_len + 1 );
</span><span class="cx"> else
</span><del>- $content_path = 'wp-content';
</del><ins>+ $content_path = 'wp-content';
</ins><span class="cx"> $rules = '<rule name="wordpress - strip index.php" stopProcessing="false">
</span><span class="cx"> <match url="^index.php/(.*)$" />
</span><span class="cx"> <action type="Rewrite" url="{R:1}" />
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-includes/taxonomy.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> */
</span><span class="cx"> function is_taxonomy( $taxonomy ) {
</span><span class="cx"> global $wp_taxonomies;
</span><del>-
</del><ins>+
</ins><span class="cx"> return isset($wp_taxonomies[$taxonomy]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,12 +261,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
</span><del>- $args['rewrite'] = wp_parse_args($args['rewrite'], array(
- 'slug' => sanitize_title_with_dashes($taxonomy),
- 'with_front' => true,
- ));
- $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
- $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</del><ins>+ $args['rewrite'] = wp_parse_args($args['rewrite'], array(
+ 'slug' => sanitize_title_with_dashes($taxonomy),
+ 'with_front' => true,
+ ));
+ $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+ $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( is_null($args['show_ui']) )
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (13732 => 13733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-03-17 16:19:58 UTC (rev 13732)
+++ trunk/wp-signup.php 2010-03-17 16:27:25 UTC (rev 13733)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> $signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
</span><span class="cx"> else
</span><span class="cx"> $signup[ 'blog' ] = 'checked="checked"';
</span><del>-
</del><ins>+
</ins><span class="cx"> //TODO - This doesn't seem to do anything do we really need it?
</span><span class="cx"> $signup['user'] = isset( $signup['user'] ) ? $signup['user'] : '';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>