<!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" />
<title>[19596] trunk: Remove extraneous spaces.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19596">19596</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-14 17:36:38 +0000 (Wed, 14 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove extraneous spaces. Props kenan3008, dimadin. fixes <a href="http://core.trac.wordpress.org/ticket/19501">#19501</a> <a href="http://core.trac.wordpress.org/ticket/19433">#19433</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.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="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.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="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminlinkparseopmlphp">trunk/wp-admin/link-parse-opml.php</a></li>
<li><a href="#trunkwpadminmaintrepairphp">trunk/wp-admin/maint/repair.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadmintoolsphp">trunk/wp-admin/tools.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/edit-tag-form.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_tag_form_pre', $tag);
</span><span class="cx">
</span><del>-do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
</del><ins>+do_action($taxonomy . '_pre_edit_form', $tag, $taxonomy); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/edit.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
</del><ins>+ $sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
</ins><span class="cx">
</span><span class="cx"> wp_redirect($sendback);
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/export.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
</del><ins>+ 'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/dashboard.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> if ( !isset( $widget_options['dashboard_primary'] ) ) {
</span><span class="cx"> $update = true;
</span><span class="cx"> $widget_options['dashboard_primary'] = array(
</span><del>- 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
- 'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
</del><ins>+ 'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
+ 'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
</ins><span class="cx"> 'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
</span><span class="cx"> 'items' => 2,
</span><span class="cx"> 'show_summary' => 1,
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> if ( !isset( $widget_options['dashboard_secondary'] ) ) {
</span><span class="cx"> $update = true;
</span><span class="cx"> $widget_options['dashboard_secondary'] = array(
</span><del>- 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
- 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
</del><ins>+ 'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
+ 'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
</ins><span class="cx"> 'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
</span><span class="cx"> 'items' => 5,
</span><span class="cx"> 'show_summary' => 0,
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span><span class="cx"> $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
</span><span class="cx"> $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
</span><del>- $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
</del><ins>+ $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
</ins><span class="cx"> if ( !EMPTY_TRASH_DAYS )
</span><span class="cx"> $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID::trash=1 delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
</span><span class="cx"> else
</span><span class="lines">@@ -1290,7 +1290,7 @@
</span><span class="cx"> <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</span><span class="cx">
</span><span class="cx"> <div class="welcome-panel-content">
</span><del>- <h3><?php _e( 'Welcome to your new WordPress site! ' ); ?></h3>
</del><ins>+ <h3><?php _e( 'Welcome to your new WordPress site!' ); ?></h3>
</ins><span class="cx"> <p class="about-description"><?php _e( 'If you need help getting started, check out our documentation on <a href="http://codex.wordpress.org/First_Steps_With_WordPress">First Steps with WordPress</a>. If you&#8217;d rather dive right in, here are a few things most people do first when they set up a new WordPress site. If you need help, use the Help tabs in the upper right corner to get information on how to use your current screen and where to go for more assistance.' ); ?></p>
</span><span class="cx"> <div class="welcome-panel-column-container">
</span><span class="cx"> <div class="welcome-panel-column">
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/file.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> * Please note that the calling function must unlink() this itself.
</span><span class="cx"> *
</span><span class="cx"> * The filename is based off the passed parameter or defaults to the current unix timestamp,
</span><del>- * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
</del><ins>+ * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> *
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Downloads a url to a local temporary file using the WordPress HTTP Class.
</span><del>- * Please note, That the calling function must unlink() the file.
</del><ins>+ * Please note, That the calling function must unlink() the file.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
</del><ins>+ * Displays a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
</ins><span class="cx"> * All chosen/entered details are saved, Excluding the Password.
</span><span class="cx"> *
</span><span class="cx"> * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx"> * @param string $form_post the URL to post the form to
</span><span class="cx"> * @param string $type the chosen Filesystem method in use
</span><span class="cx"> * @param boolean $error if the current request has failed to connect
</span><del>- * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
</del><ins>+ * @param string $context The directory which is needed access to, The write-test will be performed on this directory by get_filesystem_method()
</ins><span class="cx"> * @param string $extra_fields Extra POST fields which should be checked for to be included in the post.
</span><span class="cx"> * @return boolean False on failure. True on success.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/meta-boxes.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="minor-publishing-actions">
</span><span class="cx"> <div id="save-action">
</span><del>-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
</del><ins>+<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
</ins><span class="cx"> <input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" tabindex="4" class="button button-highlighted" />
</span><span class="cx"> <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
</span><span class="cx"> <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" tabindex="4" class="button button-highlighted" />
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> <div id="delete-action">
</span><span class="cx"> <?php
</span><span class="cx"> if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
</span><del>- <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
</del><ins>+ <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx"> <label for="contact">
</span><span class="cx"> <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
</span><span class="cx"> <label for="acquaintance">
</span><del>- <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
</del><ins>+ <input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?></label>
</ins><span class="cx"> <label for="friend">
</span><span class="cx"> <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
</span><span class="cx"> <label for="friendship">
</span><span class="lines">@@ -833,10 +833,10 @@
</span><span class="cx"> <th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
</span><span class="cx"> <label for="child">
</span><del>- <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
</span><span class="cx"> <label for="kin">
</span><del>- <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
</del><ins>+ <input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />
</ins><span class="cx"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?></label>
</span><span class="cx"> <label for="parent">
</span><span class="cx"> <input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th valign="top" scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
</span><del>- <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
</del><ins>+ <td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th valign="top" scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/ms.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> $index++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $stack = array_reverse( $stack ); // Last added dirs are deepest
</del><ins>+ $stack = array_reverse( $stack ); // Last added dirs are deepest
</ins><span class="cx"> foreach( (array) $stack as $dir ) {
</span><span class="cx"> if ( $dir != $top_dir)
</span><span class="cx"> @rmdir( $dir );
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> function update_user_status( $id, $pref, $value, $deprecated = null ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( null !== $deprecated )
</del><ins>+ if ( null !== $deprecated )
</ins><span class="cx"> _deprecated_argument( __FUNCTION__, '3.1' );
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx"> $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
</span><span class="cx"> } else {
</span><span class="cx"> $translated = format_code_lang( $code_lang );
</span><del>- $output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
</del><ins>+ $output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> <?php foreach( (array) $all_blogs as $blog ) {
</span><span class="cx"> if ( $primary_blog == $blog->userblog_id )
</span><span class="cx"> $found = true;
</span><del>- ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
</del><ins>+ ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
</ins><span class="cx"> } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <?php
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx"> * Whether or not we have a large network.
</span><span class="cx"> *
</span><span class="cx"> * The default criteria for a large network is either more than 10,000 users or more than 10,000 sites.
</span><del>- * Plugins can alter this criteria using the 'wp_is_large_network' filter.
</del><ins>+ * Plugins can alter this criteria using the 'wp_is_large_network' filter.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> * @param string $using 'sites or 'users'. Default is 'sites'.
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/nav-menu.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @uses Walker_Nav_Menu
</span><span class="cx"> */
</span><del>-class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
</del><ins>+class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
</ins><span class="cx"> /**
</span><span class="cx"> * @see Walker_Nav_Menu::start_lvl()
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @uses Walker_Nav_Menu
</span><span class="cx"> */
</span><del>-class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
</del><ins>+class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
</ins><span class="cx"> function __construct( $fields = false ) {
</span><span class="cx"> if ( $fields ) {
</span><span class="cx"> $this->db_fields = $fields;
</span><span class="lines">@@ -990,7 +990,7 @@
</span><span class="cx"> (
</span><span class="cx"> ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
</span><span class="cx"> in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
</span><del>- ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
</del><ins>+ ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
</ins><span class="cx"> ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
</span><span class="cx"> )
</span><span class="cx"> ) {
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/plugin-install.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> <?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
</span><span class="cx"> <li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
</span><span class="cx"> <?php endif; if ( ! empty($api->homepage) ) : ?>
</span><del>- <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
</del><ins>+ <li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage &#187;') ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php if ( ! empty($api->rating) ) : ?>
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/plugin.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx">
</span><span class="cx"> $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
</span><span class="cx">
</span><del>- if ( null === $position )
</del><ins>+ if ( null === $position )
</ins><span class="cx"> $menu[] = $new_menu;
</span><span class="cx"> else
</span><span class="cx"> $menu[$position] = $new_menu;
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx"> // as the first item in the submenu. If the submenu file is the same as the
</span><span class="cx"> // parent file someone is trying to link back to the parent manually. In
</span><span class="cx"> // this case, don't automatically add a link back to avoid duplication.
</span><del>- if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
</del><ins>+ if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
</ins><span class="cx"> foreach ( (array)$menu as $parent_menu ) {
</span><span class="cx"> if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
</span><span class="cx"> $submenu[$parent_slug][] = $parent_menu;
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/post.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> $post_data = _wp_translate_postdata( true, $post_data );
</span><span class="cx"> if ( is_wp_error($post_data) )
</span><span class="cx"> wp_die( $post_data->get_error_message() );
</span><del>- if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
</del><ins>+ if ( 'autosave' != $post_data['action'] && 'auto-draft' == $post_data['post_status'] )
</ins><span class="cx"> $post_data['post_status'] = 'draft';
</span><span class="cx">
</span><span class="cx"> if ( isset($post_data['visibility']) ) {
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> $tax_names = get_object_taxonomies( $post );
</span><span class="cx"> foreach ( $tax_names as $tax_name ) {
</span><span class="cx"> $taxonomy_obj = get_taxonomy($tax_name);
</span><del>- if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
</del><ins>+ if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
</ins><span class="cx"> $new_terms = $tax_input[$tax_name];
</span><span class="cx"> else
</span><span class="cx"> $new_terms = array();
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/screen.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
</span><span class="cx"> * or an existing screen object.
</span><span class="cx"> */
</span><del>-function set_current_screen( $hook_name = '' ) {
</del><ins>+function set_current_screen( $hook_name = '' ) {
</ins><span class="cx"> WP_Screen::get( $hook_name )->set_current_screen();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif;
</span><span class="cx"> if ( ! empty( $columns ) ) : ?>
</span><del>- <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
</del><ins>+ <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
</ins><span class="cx"> <div class="metabox-prefs">
</span><span class="cx"> <?php
</span><span class="cx"> $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/template.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -1300,7 +1300,7 @@
</span><span class="cx"> if ( 'attachment' == $post->name )
</span><span class="cx"> continue;
</span><span class="cx"> ?>
</span><del>- <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name, 'post'); ?> />
</del><ins>+ <input type="radio" name="find-posts-what" id="find-posts-<?php echo esc_attr($post->name); ?>" value="<?php echo esc_attr($post->name); ?>" <?php checked($post->name, 'post'); ?> />
</ins><span class="cx"> <label for="find-posts-<?php echo esc_attr($post->name); ?>"><?php echo $post->label; ?></label>
</span><span class="cx"> <?php
</span><span class="cx"> } ?>
</span><span class="lines">@@ -1409,7 +1409,7 @@
</span><span class="cx"> do_action('admin_head');
</span><span class="cx"> ?>
</span><span class="cx"> </head>
</span><del>-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin no-js iframe <?php echo apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class; ?>">
</del><ins>+<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin no-js iframe <?php echo apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class; ?>">
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="cx"> (function(){
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/theme-install.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -24,15 +24,15 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><del>- * @deprecated since 3.1.0 Use get_theme_feature_list() instead.
</del><ins>+ * @deprecated since 3.1.0 Use get_theme_feature_list() instead.
</ins><span class="cx"> *
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function install_themes_feature_list( ) {
</span><span class="cx"> if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
</span><del>- set_transient( 'wporg_theme_feature_list', array( ), 10800);
</del><ins>+ set_transient( 'wporg_theme_feature_list', array( ), 10800);
</ins><span class="cx">
</span><del>- if ( $cache )
</del><ins>+ if ( $cache )
</ins><span class="cx"> return $cache;
</span><span class="cx">
</span><span class="cx"> $feature_list = themes_api( 'feature_list', array( ) );
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> $name = wp_kses($theme->name, $themes_allowedtags);
</span><span class="cx"> $desc = wp_kses($theme->description, $themes_allowedtags);
</span><span class="cx"> //if ( strlen($desc) > 30 )
</span><del>- // $desc = substr($desc, 0, 15) . '<span class="dots">...</span><span>' . substr($desc, -15) . '</span>';
</del><ins>+ // $desc = substr($desc, 0, 15) . '<span class="dots">...</span><span>' . substr($desc, -15) . '</span>';
</ins><span class="cx">
</span><span class="cx"> $preview_link = $theme->preview_url . '?TB_iframe=true&amp;width=600&amp;height=400';
</span><span class="cx"> if ( !is_array($actions) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/theme.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @return array Array of features keyed by category with translations keyed by slug.
</del><ins>+ * @return array Array of features keyed by category with translations keyed by slug.
</ins><span class="cx"> */
</span><span class="cx"> function get_theme_feature_list() {
</span><span class="cx"> // Hard-coded list is used if api not accessible.
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> return $features;
</span><span class="cx">
</span><span class="cx"> if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
</span><del>- set_site_transient( 'wporg_theme_feature_list', array( ), 10800);
</del><ins>+ set_site_transient( 'wporg_theme_feature_list', array( ), 10800);
</ins><span class="cx">
</span><span class="cx"> if ( !$feature_list ) {
</span><span class="cx"> $feature_list = themes_api( 'feature_list', array( ) );
</span></span></pre></div>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/update-core.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> * introduced version present here being older than the current installed version.
</span><span class="cx"> *
</span><span class="cx"> * The content of this array should follow the following format:
</span><del>- * Filename (relative to wp-content) => Introduced version
</del><ins>+ * Filename (relative to wp-content) => Introduced version
</ins><span class="cx"> * Directories should be noted by suffixing it with a trailing slash (/)
</span><span class="cx"> *
</span><span class="cx"> * @since 3.2.0
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/update.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> if ( current_user_can('update_core') ) {
</span><span class="cx"> $cur = get_preferred_from_update_core();
</span><span class="cx">
</span><del>- if ( isset( $cur->response ) && $cur->response == 'upgrade' )
</del><ins>+ if ( isset( $cur->response ) && $cur->response == 'upgrade' )
</ins><span class="cx"> $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/includes/upgrade.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> $message = '<em>'.__('Your chosen password.').'</em>';
</span><span class="cx"> $user_id = wp_create_user($user_name, $user_password, $user_email);
</span><span class="cx"> } else {
</span><del>- $message = __('User already exists. Password inherited.');
</del><ins>+ $message = __('User already exists. Password inherited.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="lines">@@ -1667,7 +1667,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><del>-function make_db_current_silent( $tables = 'all' ) {
</del><ins>+function make_db_current_silent( $tables = 'all' ) {
</ins><span class="cx"> $alterations = dbDelta( $tables );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1848,12 +1848,12 @@
</span><span class="cx">
</span><span class="cx"> if (file_exists(ABSPATH . 'wp-layout.css')) {
</span><span class="cx"> if (! make_site_theme_from_oldschool($theme_name, $template)) {
</span><del>- // TODO: rm -rf the site theme directory.
</del><ins>+ // TODO: rm -rf the site theme directory.
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (! make_site_theme_from_default($theme_name, $template))
</span><del>- // TODO: rm -rf the site theme directory.
</del><ins>+ // TODO: rm -rf the site theme directory.
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminlinkparseopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-parse-opml.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-parse-opml.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/link-parse-opml.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> global $opml, $map;
</span><span class="cx">
</span><del>-// columns we wish to find are: link_url, link_name, link_target, link_description
</del><ins>+// columns we wish to find are: link_url, link_name, link_target, link_description
</ins><span class="cx"> // we need to map XML attribute names to our columns
</span><span class="cx"> $opml_map = array('URL' => 'link_url',
</span><span class="cx"> 'HTMLURL' => 'link_url',
</span></span></pre></div>
<a id="trunkwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/maint/repair.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/maint/repair.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> printf( __( 'Successfully repaired the %s table.' ), $table );
</span><span class="cx"> } else {
</span><span class="cx"> /* translators: 1: table name, 2: error message, */
</span><del>- echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
</del><ins>+ echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
</ins><span class="cx"> $problems[$table] = $check->Msg_text;
</span><span class="cx"> $okay = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/nav-menus.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx">
</span><span class="cx"> // Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth
</span><span class="cx"> if ( is_nav_menu( $nav_menu_selected_id ) )
</span><del>- $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
</del><ins>+ $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
</ins><span class="cx">
</span><span class="cx"> function wp_nav_menu_max_depth($classes) {
</span><span class="cx"> global $_wp_nav_menu_max_depth;
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> <div class="major-publishing-actions">
</span><span class="cx"> <label class="menu-name-label howto open-label" for="menu-name">
</span><span class="cx"> <span><?php _e('Menu Name'); ?></span>
</span><del>- <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" />
</del><ins>+ <input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here'); ?>" value="<?php echo esc_attr( $nav_menu_selected_title ); ?>" />
</ins><span class="cx"> </label>
</span><span class="cx"> <?php if ( !empty( $nav_menu_selected_id ) ) :
</span><span class="cx"> if ( ! isset( $auto_add ) ) {
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/network/menu.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> unset($update_data);
</span><span class="cx">
</span><del>-$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
</del><ins>+$submenu[ 'upgrade.php' ][10] = array( __( 'Available Updates' ), 'update_core', 'update-core.php' );
</ins><span class="cx"> $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
</span><span class="cx">
</span><span class="cx"> $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/options-general.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
</span><del>-<td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
</del><ins>+<td><input name="blogdescription" type="text" id="blogdescription" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
</ins><span class="cx"> <span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> echo ' ';
</span><span class="cx"> $message = $tr['isdst'] ?
</span><span class="cx"> __('Daylight saving time begins on: <code>%s</code>.') :
</span><del>- __('Standard time begins on: <code>%s</code>.');
</del><ins>+ __('Standard time begins on: <code>%s</code>.');
</ins><span class="cx"> // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
</span><span class="cx"> printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/options-permalink.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -257,14 +257,14 @@
</span><span class="cx"> <?php wp_nonce_field('update-permalink') ?>
</span><span class="cx"> <p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
</span><span class="cx"> </form>
</span><del>-<p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
</del><ins>+<p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <p><?php _e('If the root directory of your site were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
</span><span class="cx"> <form action="options-permalink.php" method="post">
</span><span class="cx"> <?php wp_nonce_field('update-permalink') ?>
</span><span class="cx"> <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
</span><span class="cx"> </form>
</span><del>-<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
</del><ins>+<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php else :
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/options-reading.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
</span><del>-<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Full text' ); ?></label><br />
</del><ins>+<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Full text' ); ?></label><br />
</ins><span class="cx"> <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/options.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle settings errors and return to options page
</del><ins>+ * Handle settings errors and return to options page
</ins><span class="cx"> */
</span><span class="cx"> // If no settings errors were registered add a general 'updated' message.
</span><span class="cx"> if ( !count( get_settings_errors() ) )
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/press-this.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> show('video');
</span><span class="cx"> <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
</span><span class="cx"> show('video');
</span><del>- <?php } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
</del><ins>+ <?php } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
</ins><span class="cx"> show('photo');
</span><span class="cx"> <?php } ?>
</span><span class="cx"> jQuery('#title').unbind();
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx">
</span><span class="cx"> $content = '';
</span><span class="cx"> if ( $selection )
</span><del>- $content .= $selection;
</del><ins>+ $content .= $selection;
</ins><span class="cx">
</span><span class="cx"> if ( $url ) {
</span><span class="cx"> $content .= '<p>';
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/themes.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) $class = ' class="current"';
</span><span class="cx">
</span><span class="cx"> if ( !empty($submenu[$item[2]]) ) {
</span><del>- $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
</del><ins>+ $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
</ins><span class="cx"> $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
</span><span class="cx"> if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
</span><span class="cx"> $options[] = "<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class>{$item[0]}</a>";
</span></span></pre></div>
<a id="trunkwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/tools.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/tools.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/tools.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 'id' => 'converter',
</span><span class="cx"> 'title' => __('Categories and Tags Converter'),
</span><span class="cx"> 'content' => '<p>' . __('Categories have hierarchy, meaning that you can nest sub-categories. Tags do not have hierachy and cannot be nested. Sometimes people start out using one on their posts, then later realize that the other would work better for their content.' ) . '</p>' .
</span><del>- '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
</del><ins>+ '<p>' . __( 'The Categories and Tags Converter link on this screen will take you to the Import screen, where that Converter is one of the plugins you can install. Once that plugin is installed, return to this screen and the link will take you to a screen where you can choose to convert tags into categories or vice versa.' ) . '</p>',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/upgrade.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> case 1:
</span><span class="cx"> wp_upgrade();
</span><span class="cx">
</span><del>- $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
</del><ins>+ $backto = !empty($_GET['backto']) ? stripslashes( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
</ins><span class="cx"> $backto = esc_url( $backto );
</span><span class="cx"> $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-admin/user-new.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> Please click the following link to confirm the invite:
</span><span class="cx"> %4$s' );
</span><del>- wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
</del><ins>+ wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
</ins><span class="cx"> $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> <?php if ( is_multisite() && is_super_admin() ) { ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
</span><del>- <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
</del><ins>+ <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (19595 => 19596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2011-12-14 02:56:59 UTC (rev 19595)
+++ trunk/wp-includes/capabilities.php 2011-12-14 17:36:38 UTC (rev 19596)
</span><span class="lines">@@ -487,10 +487,15 @@
</span><span class="cx"> static function get_data_by( $field, $value ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( 'id' == $field )
</del><ins>+ if ( 'id' == $field ) {
+ // Make sure the value is numeric to avoid casting objects, for example,
+ // to int 1.
+ if ( ! is_numeric( $value ) )
+ return false;
</ins><span class="cx"> $value = absint( $value );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $value = trim( $value );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( !$value )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>