<!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>[13830] trunk: Remove trailing whites and double semicolons.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13830">13830</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-26 19:36:49 +0000 (Fri, 26 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whites and double semicolons.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpcontentthemesdefaultfunctionsphp">trunk/wp-content/themes/default/functions.php</a></li>
<li><a href="#trunkwpcontentthemesdefaultpagephp">trunk/wp-content/themes/default/page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarfooterphp">trunk/wp-content/themes/twentyten/sidebar-footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.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="#trunkwpincludespomomophp">trunk/wp-includes/pomo/mo.php</a></li>
<li><a href="#trunkwpincludespomopophp">trunk/wp-includes/pomo/po.php</a></li>
<li><a href="#trunkwpincludespomotranslationsphp">trunk/wp-includes/pomo/translations.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/admin-ajax.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -1395,24 +1395,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> die( '0' );
</span><del>-case 'save-custom-link':
</del><ins>+case 'save-custom-link':
</ins><span class="cx"> if ( ! current_user_can('manage_links') )
</span><span class="cx"> die('-1');
</span><del>-
</del><ins>+
</ins><span class="cx"> $link_name = isset( $_POST['link_name'] ) ? esc_html($_POST['link_name']) : null;
</span><span class="cx"> $link_url = isset( $_POST['link_url'] ) ? esc_url_raw($_POST['link_url']) : null;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$link_name || !$link_url )
</span><span class="cx"> die('-1');
</span><del>-
</del><ins>+
</ins><span class="cx"> $post = array(
</span><span class="cx"> 'post_status' => 'draft', 'post_type' => 'nav_menu_item', 'ping_status' => 0,
</span><span class="cx"> 'post_author' => $user_ID, 'post_title' => $link_name, 'post_excerpt' => '',
</span><span class="cx"> 'post_parent' => 0, 'menu_order' => 0, 'post_content' => '',
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $link_id = wp_insert_post( $post );
</span><del>-
</del><ins>+
</ins><span class="cx"> update_post_meta( $link_id, '_menu_item_type', 'custom' );
</span><span class="cx"> update_post_meta( $link_id, '_menu_item_object_id', (int) $link_id );
</span><span class="cx"> update_post_meta( $link_id, '_menu_item_object', 'custom' );
</span><span class="lines">@@ -1420,7 +1420,7 @@
</span><span class="cx"> update_post_meta( $link_id, '_menu_item_classes', '' );
</span><span class="cx"> update_post_meta( $link_id, '_menu_item_xfn', '' );
</span><span class="cx"> update_post_meta( $link_id, '_menu_item_url', $link_url );
</span><del>-
</del><ins>+
</ins><span class="cx"> die( json_encode($link_id) );
</span><span class="cx"> default :
</span><span class="cx"> do_action( 'wp_ajax_' . $_POST['action'] );
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/custom-background.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> $bgcolor = 'background-color: #' . $bgcolor . ';';
</span><span class="cx">
</span><span class="cx"> if ( $align = get_theme_mod('background_position', 'left') )
</span><del>- $align = "text-align: $align;";
</del><ins>+ $align = "text-align: $align;";
</ins><span class="cx"> ?>
</span><span class="cx"> <div id="custom-background-image" style="<?php echo $bgcolor, $align ?>">
</span><span class="cx"> <?php if ( get_background_image() ) { ?>
</span></span></pre></div>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/import/wordpress.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> $comments = $comments[1];
</span><span class="cx"> $num_comments = 0;
</span><span class="cx"> $inserted_comments = array();
</span><del>- if ( $comments) {
</del><ins>+ if ( $comments) {
</ins><span class="cx"> foreach ($comments as $comment) {
</span><span class="cx"> $comment_id = $this->get_tag( $comment, 'wp:comment_id');
</span><span class="cx"> $newcomments[$comment_id]['comment_post_ID'] = $comment_post_ID;
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function fetch_remote_file( $post, $url ) {
</del><ins>+ function fetch_remote_file( $post, $url ) {
</ins><span class="cx"> add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
</span><span class="cx">
</span><span class="cx"> $upload = wp_upload_dir($post['post_date']);
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -405,18 +405,18 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Display comments for post table header
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param $result table header rows
</span><del>- * @return
- */
-function post_comment_meta_box_thead($result) {
</del><ins>+ * @return
+ */
+function post_comment_meta_box_thead($result) {
</ins><span class="cx"> unset($result['cb'], $result['response']);
</span><del>- return $result;
-}
</del><ins>+ return $result;
+}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Display comments for post.
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx">
</span><span class="cx"> <table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
</span><span class="cx"> <thead><tr>
</span><del>- <?php print_column_headers('edit-comments'); ?>
</del><ins>+ <?php print_column_headers('edit-comments'); ?>
</ins><span class="cx"> </tr></thead>
</span><span class="cx"> <tbody id="the-comment-list" class="list:comment"></tbody>
</span><span class="cx"> </table>
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> <script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>- remove_filter('manage_edit-comments_columns', 'post_comment_meta_box_thead');
</del><ins>+ remove_filter('manage_edit-comments_columns', 'post_comment_meta_box_thead');
</ins><span class="cx"> wp_comment_trashnotice();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/includes/nav-menu.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -17,12 +17,12 @@
</span><span class="cx"> **/
</span><span class="cx"> function wp_initial_nav_menu_meta_boxes() {
</span><span class="cx"> global $wp_meta_boxes;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !get_user_option( 'meta-box-hidden_nav-menus' ) && is_array($wp_meta_boxes) ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> $initial_meta_boxes = array( 'manage-menu', 'create-menu', 'add-custom-links', 'add-page', 'add-category' );
</span><span class="cx"> $hidden_meta_boxes = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
</span><span class="cx"> foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
</span><span class="cx"> foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> }
</span><span class="cx"> $user = wp_get_current_user();
</span><span class="cx"> update_user_meta( $user->ID, 'meta-box-hidden_nav-menus', $hidden_meta_boxes );
</span><del>-
</del><ins>+
</ins><span class="cx"> // returns all the hidden metaboxes to the js function: wpNavMenu.initial_meta_boxes()
</span><span class="cx"> return join( ',', $hidden_meta_boxes );
</span><span class="cx"> }
</span><span class="lines">@@ -151,7 +151,7 @@
</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"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class="add-to-menu">
</span><span class="cx"> <a class="button"><?php _e('Add to Menu'); ?></a>
</span><span class="cx"> </span>
</span><span class="lines">@@ -205,7 +205,7 @@
</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"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class="add-to-menu">
</span><span class="cx"> <a class="button"><?php _e('Add to Menu'); ?></a>
</span><span class="cx"> </span>
</span><span class="lines">@@ -272,7 +272,7 @@
</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"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class="add-to-menu">
</span><span class="cx"> <a class="button"><?php _e('Add to Menu'); ?></a>
</span><span class="cx"> </span>
</span><span class="lines">@@ -327,13 +327,13 @@
</span><span class="cx"> if ( 0 == $menu_item->post_parent ) {
</span><span class="cx"> // Set up the menu item
</span><span class="cx"> $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
</span><del>-
</del><ins>+
</ins><span class="cx"> // No blank titles
</span><span class="cx"> if ( empty($menu_item->title) )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</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></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-admin/nav-menus.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_nav_menu($nav_menu_selected_id) ) {
</span><span class="cx"> $delete_nav_menu = wp_delete_nav_menu( $nav_menu_selected_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_wp_error($delete_nav_menu) ) {
</span><span class="cx"> $messages_div = '<div id="message" class="error"><p>' . $delete_nav_menu->get_error_message() . '</p></div>';
</span><span class="cx"> } else {
</span><span class="lines">@@ -93,30 +93,30 @@
</span><span class="cx"> unset( $add_nav_menu );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo wrap this into wp_update_nav_menu_object();
</span><span class="cx"> if ( isset($_POST['menu-name']) ) {
</span><span class="cx"> $old_nav_menu = get_term( $nav_menu_selected_id, 'nav_menu', ARRAY_A );
</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><del>-
</del><ins>+
</ins><span class="cx"> // @todo: wrap update logic into wp_update_nav_menu();
</span><span class="cx"> $update_count = isset( $_POST['li-count'] ) ? (int) $_POST['li-count'] : 0;
</span><span class="cx"> $update_nav_menu = is_nav_menu( $nav_menu_selected_id );
</span><span class="cx">
</span><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><del>-
</del><ins>+
</ins><span class="cx"> // Loop through all POST variables
</span><span class="cx"> for ( $k = 0; $k < $update_count; $k++ ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Menu item title can't be blank
</span><span class="cx"> if ( '' == $_POST['menu-item-title'][$k] )
</span><span class="cx"> continue;
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_item_db_id = isset( $_POST['menu-item-db-id'][$k] ) ? $_POST['menu-item-db-id'][$k] : 0;
</span><span class="cx"> $menu_item_object_id = isset( $_POST['menu-item-object-id'][$k] ) ? $_POST['menu-item-object-id'][$k] : 0;
</span><span class="cx"> $menu_item_object = isset( $_POST['menu-item-object'][$k] ) ? $_POST['menu-item-object'][$k] : '';
</span><span class="lines">@@ -140,11 +140,11 @@
</span><span class="cx"> 'post_parent' => $menu_item_parent_id, 'menu_order' => $menu_item_position,
</span><span class="cx"> 'post_content' => $menu_item_description,
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> // New menu item
</span><span class="cx"> if ( $menu_item_db_id == 0 ) {
</span><span class="cx"> $menu_item_db_id = wp_insert_post( $post );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Update existing menu item
</span><span class="cx"> } elseif ( isset($menu_items[$menu_item_db_id]) || ( 'custom' == $menu_item_type && 0 != $menu_item_db_id ) ) {
</span><span class="cx"> $post['ID'] = $menu_item_db_id;
</span><span class="lines">@@ -170,9 +170,9 @@
</span><span class="cx"> wp_delete_post( $menu_item_id );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> $messages_div = '<div id="message" class="updated"><p>' . sprintf( __('The <strong>%s</strong> menu has been updated.'), $update_nav_menu->name ) . '</p></div>';
</span><span class="cx"> unset( $update_nav_menu, $update_count, $menu_items );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemesdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/default/functions.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/default/functions.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/default/functions.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> display: <?php echo kubrick_header_display_string(); ?>;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> .description {
</span><span class="cx"> margin-top: 16px;
</span><span class="cx"> color: #fff;
</span></span></pre></div>
<a id="trunkwpcontentthemesdefaultpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/default/page.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/default/page.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/default/page.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php endwhile; endif; ?>
</span><span class="cx"> <?php edit_post_link('Edit this entry.', '<p>', '</p>'); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php comments_template(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx"> } else {
</span><span class="cx"> $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
</span><span class="cx"> }
</span><del>- printf(
</del><ins>+ printf(
</ins><span class="cx"> $utility_text,
</span><span class="cx"> get_the_category_list( ', ' ),
</span><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute( 'echo=0' ),
</span><del>- get_post_comments_feed_link()
- );
</del><ins>+ get_post_comments_feed_link()
+ );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/category.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php
</del><ins>+ <h1 class="page-title"><?php
</ins><span class="cx"> printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</span><span class="cx"> ?></h1>
</span><span class="cx"> <?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>- <h3 id="comments-title"><?php comments_number(
</del><ins>+ <h3 id="comments-title"><?php comments_number(
</ins><span class="cx"> sprintf( __( 'No Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
</span><span class="cx"> sprintf( __( 'One Response to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
</span><span class="cx"> sprintf( __( '%% Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> global $wp_query, $post;
</span><span class="cx"> $current_term = $wp_query->get_queried_object();
</span><span class="cx"> $terms = wp_get_object_terms( $post->ID, $taxonomy );
</span><del>- // If we're viewing a Taxonomy page..
</del><ins>+ // If we're viewing a Taxonomy page..
</ins><span class="cx"> if ( isset( $current_term->taxonomy ) && $taxonomy == $current_term->taxonomy ) {
</span><span class="cx"> // Remove the term from display.
</span><span class="cx"> foreach ( (array) $terms as $key => $term ) {
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/header.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> } elseif ( is_page() ) {
</span><span class="cx"> single_post_title( '' ); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } elseif ( is_search() ) {
</span><del>- printf( __( 'Search results for "%s"', 'twentyten' ), esc_html( $s ) ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</del><ins>+ printf( __( 'Search results for "%s"', 'twentyten' ), esc_html( $s ) ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } elseif ( is_404() ) {
</span><span class="cx"> _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> echo wp_get_attachment_image( $image->ID, 'thumbnail' );
</span><span class="cx"> ?></a>
</span><span class="cx"> </div>
</span><del>- <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
- 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
- $total_images
</del><ins>+ <p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
+ 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
+ $total_images
</ins><span class="cx"> ); ?></em></p>
</span><span class="cx">
</span><span class="cx"> <?php the_excerpt( '' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar-footer.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?php
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> is_active_sidebar( 'first-footer-widget-area' ) ||
</span><span class="cx"> is_active_sidebar( 'second-footer-widget-area' ) ||
</span><span class="cx"> is_active_sidebar( 'third-footer-widget-area' ) ||
</span><del>- is_active_sidebar( 'fourth-footer-widget-area' )
</del><ins>+ is_active_sidebar( 'fourth-footer-widget-area' )
</ins><span class="cx"> ) :
</span><span class="cx"> ?>
</span><span class="cx"> <div id="footer-widget-area">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/single.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -49,14 +49,14 @@
</span><span class="cx"> } else {
</span><span class="cx"> $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
</span><span class="cx"> }
</span><del>- printf(
</del><ins>+ printf(
</ins><span class="cx"> $utility_text,
</span><span class="cx"> get_the_category_list( ', ' ),
</span><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute( 'echo=0' ),
</span><del>- get_post_comments_feed_link()
- );
</del><ins>+ get_post_comments_feed_link()
+ );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php
</del><ins>+ <h1 class="page-title"><?php
</ins><span class="cx"> printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</span><span class="cx"> ?></h1>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/classes.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> else
</span><span class="cx"> $children_elements[ $e->$parent_field ][] = $e;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /*
</span><span class="cx"> * when none of the elements is top level
</span><span class="cx"> * assume the first one must be root of the sub elements
</span><span class="lines">@@ -1182,26 +1182,26 @@
</span><span class="cx"> */
</span><span class="cx"> function start_el(&$output, $item, $depth, $args) {
</span><span class="cx"> $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'frontend' == $args->context ) {
</span><span class="cx"> global $wp_query;
</span><del>-
</del><ins>+
</ins><span class="cx"> $css_class = array( 'menu-item', 'menu-item-type-'. $item->type, $item->classes );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'custom' != $item->object )
</span><span class="cx"> $css_class[] = 'menu-item-object-'. $item->object;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $item->object_id == $wp_query->get_queried_object_id() )
</span><span class="cx"> $css_class[] = 'current-menu-item';
</span><del>-
</del><ins>+
</ins><span class="cx"> // @todo add classes for parent/child relationships
</span><span class="cx">
</span><span class="cx"> $css_class = join( ' ', apply_filters('nav_menu_css_class', $css_class, $item) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $maybe_value = ( 'backend' == $args->context ) ? ' value="'. $item->ID .'"' : '';
</span><span class="cx"> $maybe_classes = ( 'frontend' == $args->context ) ? ' class="'. $css_class .'"' : '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $output .= $indent . '<li id="menu-item-'. $item->ID .'"'. $maybe_value . $maybe_classes .'>' . wp_get_nav_menu_item( $item, $args->context, $args );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/load.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_fix_server_vars() {
</span><span class="cx"> global $PHP_SELF;
</span><del>-
</del><ins>+
</ins><span class="cx"> $default_server_values = array(
</span><span class="cx"> 'SERVER_SOFTWARE' => '',
</span><span class="cx"> 'REQUEST_URI' => '',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $_SERVER = array_merge( $default_server_values, $_SERVER );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Fix for IIS when running with PHP ISAPI
</span><span class="cx"> if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/nav-menu-template.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -50,7 +50,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">@@ -62,7 +62,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">@@ -84,22 +84,22 @@
</span><span class="cx"> function wp_get_nav_menu( $args = array() ) {
</span><span class="cx"> $defaults = array( 'menu' => '', 'menu_class' => 'menu', 'context' => 'frontend', 'depth' => 0,
</span><span class="cx"> 'fallback_cb' => '', 'walker' => '', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', );
</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><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, $args->context );
</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) || is_callable( $args->fallback_cb ) ) {
</span><span class="lines">@@ -107,17 +107,17 @@
</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"> // Set up the $menu_item variables
</span><span class="cx"> foreach ( (array) $menu_items as $key => $menu_item )
</span><span class="cx"> $menu_items[$menu_item->menu_order] = wp_setup_nav_menu_item( $menu_item, 'frontend' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $items .= walk_nav_menu_tree( $menu_items, $args->depth, $args );
</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">@@ -126,9 +126,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">@@ -150,27 +150,27 @@
</span><span class="cx"> $attributes .= ( isset($menu_item->target) && '' != $menu_item->target ) ? ' target="'. esc_attr($menu_item->target) .'"' : '';
</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 );
</span><span class="cx"> $output .= '<a'. $attributes .'>';
</span><span class="cx"> $output .= esc_html( $args->link_before . apply_filters('the_title', $menu_item->title) . $args->link_after );
</span><span class="cx"> $output .= '</a>';
</span><span class="cx"> $output .= esc_html( $args->after );
</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="cx"> $output .= '<span class="item-controls">';
</span><span class="cx"> $output .= '<span class="item-type">'. esc_html( $menu_item->append ) .'</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->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'" 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->ID ) .'" value="'. esc_attr( $menu_item->ID ) .'">'. __('Delete') .'</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $output .= '</span></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[]" value="'. esc_attr( $menu_item->ID ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-object-id[]" value="'. esc_attr( $menu_item->object_id ) .'" />';
</span><span class="lines">@@ -186,12 +186,12 @@
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-attr-title[]" value="'.esc_attr( $menu_item->post_excerpt ) .'" />';
</span><span class="cx"> $output .= '<input type="hidden" name="menu-item-target[]" 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"> case 'taxonomy':
</span><span class="cx"> case 'post_type':
</span><span class="cx"> $output .= '<label class="menu-item-title"><input type="checkbox" id="'. esc_attr( 'menu-item-' . $menu_item->object_id ) .'" 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">@@ -209,7 +209,7 @@
</span><span class="cx"> $output .= '<input type="hidden" class="menu-item-xfn" value="'. esc_attr( $menu_item->xfn ) .'" />';
</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 (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/nav-menu.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> return $menu;
</span><span class="cx">
</span><span class="cx"> $result = get_term( $menu['term_id'], 'nav_menu' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $result && !is_wp_error($result) ) {
</span><span class="cx"> do_action( 'wp_create_nav_menu', $menu['term_id'] );
</span><span class="cx"> return $result;
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> wp_delete_post( $item );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $result = wp_delete_term( $menu->term_id, 'nav_menu' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $result && !is_wp_error($result) ) {
</span><span class="cx"> do_action( 'wp_delete_nav_menu', $menu->term_id );
</span><span class="cx"> return $result;
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> function walk_nav_menu_tree( $items, $depth, $r ) {
</span><span class="cx"> $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
</span><span class="cx"> $args = array( $items, $depth, $r );
</span><del>-
</del><ins>+
</ins><span class="cx"> return call_user_func_array(array(&$walker, 'walk'), $args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,19 +198,19 @@
</span><span class="cx"> $menu_item->object_id = get_post_meta( $menu_item->ID, '_menu_item_object_id', true );
</span><span class="cx"> $menu_item->object = get_post_meta( $menu_item->ID, '_menu_item_object', true );
</span><span class="cx"> $menu_item->type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'post_type' == $menu_item->type ) {
</span><span class="cx"> $object = get_post_type_object( $menu_item->object );
</span><span class="cx"> $menu_item->append = $object->singular_label;
</span><del>-
</del><ins>+
</ins><span class="cx"> } elseif ( 'taxonomy' == $menu_item->type ) {
</span><span class="cx"> $object = get_taxonomy( $menu_item->object );
</span><span class="cx"> $menu_item->append = $object->singular_label;
</span><del>-
</del><ins>+
</ins><span class="cx"> } else {
</span><span class="cx"> $menu_item->append = __('Custom');
</span><span class="cx"> }
</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><span class="lines">@@ -218,7 +218,7 @@
</span><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><del>- $menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_classes', true );;
</del><ins>+ $menu_item->classes = get_post_meta( $menu_item->ID, '_menu_item_classes', true );
</ins><span class="cx"> $menu_item->xfn = get_post_meta( $menu_item->ID, '_menu_item_xfn', true );
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> $menu_item->classes = '';
</span><span class="cx"> $menu_item->xfn = '';
</span><span class="cx"> break;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> return $menu_item;
</span><span class="cx"> }
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludespomomophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/mo.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/mo.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/pomo/mo.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Build a Translation_Entry from original string and translation strings,
</span><span class="cx"> * found in a MO file
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @static
</span><span class="cx"> * @param string $original original string to translate from MO file. Might contain
</span><span class="cx"> * 0x04 as context separator or 0x00 as singular/plural separator
</span></span></pre></div>
<a id="trunkwpincludespomopophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/po.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/po.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/pomo/po.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Gives back the original string from a PO-formatted string
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @static
</span><span class="cx"> * @param string $string PO-formatted string
</span><span class="cx"> * @return string enascaped string
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Inserts $with in the beginning of every new line of $string and
</del><ins>+ * Inserts $with in the beginning of every new line of $string and
</ins><span class="cx"> * returns the modified string
</span><span class="cx"> *
</span><span class="cx"> * @static
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> // add comment
</span><del>- $this->add_comment_to_entry($entry, $line);;
</del><ins>+ $this->add_comment_to_entry($entry, $line);
</ins><span class="cx"> } elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
</span><span class="cx"> if ($is_final($context)) {
</span><span class="cx"> PO::read_line($f, 'put-back');
</span><span class="lines">@@ -360,4 +360,4 @@
</span><span class="cx"> return $s;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-endif;
</del><span class="cx">\ No newline at end of file
</span><ins>+endif;
</ins></span></pre></div>
<a id="trunkwpincludespomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/translations.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/translations.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/pomo/translations.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Adds parantheses to the inner parts of ternary operators in
</span><span class="cx"> * plural expressions, because PHP evaluates ternary oerators from left to right
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $expression the expression without parentheses
</span><span class="cx"> * @return string the expression with parentheses added
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13829 => 13830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-03-26 19:23:39 UTC (rev 13829)
+++ trunk/wp-includes/query.php 2010-03-26 19:36:49 UTC (rev 13830)
</span><span class="lines">@@ -1715,9 +1715,9 @@
</span><span class="cx"> if ( !empty($q['post_type']) && !empty($q[ $q['post_type'] ]) ) {
</span><span class="cx"> $q[ $q['post_type'] ] = str_replace('%2F', '/', urlencode(urldecode($q[ $q['post_type'] ])));
</span><span class="cx"> $post_type_object = get_post_type_object($q['post_type']);
</span><del>- if ( ! $post_type_object->hierarchical || strpos($q[ $q['post_type'] ], '/') === false) {
</del><ins>+ if ( ! $post_type_object->hierarchical || strpos($q[ $q['post_type'] ], '/') === false) {
</ins><span class="cx"> $q['name'] = $q[ $q['post_type'] ] = sanitize_title($q[ $q['post_type'] ]);
</span><del>- $where .= " AND $wpdb->posts.post_name = '" . $q[ $q['post_type'] ] . "'";
</del><ins>+ $where .= " AND $wpdb->posts.post_name = '" . $q[ $q['post_type'] ] . "'";
</ins><span class="cx"> } else {
</span><span class="cx"> // Hierarchical post type, need to look deeper to see if its an attachment or this post_type
</span><span class="cx"> if ( isset($this->queried_object_id) ) {
</span></span></pre>
</div>
</div>
</body>
</html>