<!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>[17228] trunk: Bring out the shears.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17228">17228</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-06 04:11:14 +0000 (Thu, 06 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring out the shears.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincsscolorsclassicdevcss">trunk/wp-admin/css/colors-classic.dev.css</a></li>
<li><a href="#trunkwpadminincludesclasswpcommentslisttablephp">trunk/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminjseditcommentsdevjs">trunk/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#trunkwpadminjslisttabledevjs">trunk/wp-admin/js/list-table.dev.js</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkcsswplinkdevcss">trunk/wp-includes/js/tinymce/plugins/wplink/css/wplink.dev.css</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkjswplinkdevjs">trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js</a></li>
<li><a href="#trunkwpincludesjswplistsdevjs">trunk/wp-includes/js/wp-lists.dev.js</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.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 (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/admin-ajax.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ( 'single' == $_REQUEST['mode'] ) {
</span><span class="cx"> $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx"> $wp_list_table = get_list_table('WP_Comments_List_Table');
</span><span class="cx"> }
</span><span class="cx"> $wp_list_table->single_row( $comment );
</span></span></pre></div>
<a id="trunkwpadmincsscolorsclassicdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.dev.css (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.dev.css 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/css/colors-classic.dev.css 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -1464,7 +1464,7 @@
</span><span class="cx"> background-color: #f5f5f5;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs li.tabs a,
</del><ins>+#post-body ul.category-tabs li.tabs a,
</ins><span class="cx"> #post-body ul.add-menu-item-tabs li.tabs a,
</span><span class="cx"> body.press-this ul.category-tabs li.tabs a {
</span><span class="cx"> color: #333;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-comments-list-table.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-comments-list-table.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/class-wp-comments-list-table.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -66,13 +66,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $page = $this->get_pagenum();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $_REQUEST['start'] ) ) {
</span><span class="cx"> $start = $_REQUEST['start'];
</span><span class="cx"> } else {
</span><span class="cx"> $start = ( $page - 1 ) * $comments_per_page;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $doing_ajax && isset( $_REQUEST['offset'] ) ) {
</span><span class="cx"> $start += $_REQUEST['offset'];
</span><span class="cx"> }
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> 'per_page' => $comments_per_page,
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get_per_page( $comment_status = 'all' ) {
</span><span class="cx"> $comments_per_page = $this->get_items_per_page( 'edit_comments_per_page' );
</span><span class="cx"> $comments_per_page = apply_filters( 'comments_per_page', $comments_per_page, $comment_status );
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
</span><span class="cx">
</span><span class="cx"> function get_column_info() {
</span><del>- $this->_column_headers = array(
</del><ins>+ $this->_column_headers = array(
</ins><span class="cx"> array(
</span><span class="cx"> 'author' => __( 'Author' ),
</span><span class="cx"> 'comment' => _x( 'Comment', 'column name' ),
</span><span class="lines">@@ -521,16 +521,16 @@
</span><span class="cx"> array(),
</span><span class="cx"> array(),
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $this->_column_headers;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get_table_classes() {
</span><span class="cx"> $classes = parent::get_table_classes();
</span><span class="cx"> $classes[] = 'comments-box';
</span><span class="cx"> return $classes;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function display( $output_empty = false ) {
</span><span class="cx"> extract( $this->_args );
</span><span class="cx"> ?>
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function get_per_page( $comment_status = false ) {
</span><span class="cx"> return 10;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><span class="cx"> * @param string $text The search button text
</span><del>- * @param string $input_id The search input id
</del><ins>+ * @param string $input_id The search input id
</ins><span class="cx"> */
</span><span class="cx"> function search_box( $text, $input_id ) {
</span><span class="cx"> if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
</span><span class="cx"> $actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
</span><del>-
</del><ins>+
</ins><span class="cx"> $class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
</span><span class="cx"> $checkbox_id = "checkbox_" . md5($theme['Name']);
</span><span class="cx"> $checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme['Name'] . "</label>";
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'search' != $type ) {
</span><span class="cx"> $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</span><span class="cx"> add_query_arg('plugin_status', $type, 'plugins.php'),
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> 'per_page' => $tags_per_page,
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function has_items() {
</span><span class="cx"> // todo: populate $this->items in prepare_items()
</span><span class="cx"> return true;
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> // convert it to table rows
</span><span class="cx"> $out = '';
</span><span class="cx"> $count = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> $terms = array();
</span><span class="cx">
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) && !isset( $orderby ) ) {
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> $out .= $this->single_row( $term, 0, $taxonomy );
</span><span class="cx"> $count = $number; // Only displaying a single page.
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $terms ) ) {
</span><span class="cx"> echo '<tr class="no-items"><td colspan="2">';
</span><span class="cx"> $this->no_items();
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/ms.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
</span><span class="cx"> if ( get_site_option( 'upload_space_check_disabled' ) )
</span><span class="cx"> return min( $size, $fileupload_maxk );
</span><del>-
</del><ins>+
</ins><span class="cx"> return min( $size, $fileupload_maxk, get_upload_space_available() );
</span><span class="cx"> }
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/post.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -1221,7 +1221,7 @@
</span><span class="cx"> $lock = explode( ':', $lock );
</span><span class="cx"> $time = $lock[0];
</span><span class="cx"> $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
</span><del>-
</del><ins>+
</ins><span class="cx"> $time_window = apply_filters( 'wp_check_post_lock_window', AUTOSAVE_INTERVAL * 2 );
</span><span class="cx">
</span><span class="cx"> if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/includes/template.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> echo $content;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $mode == 'single' ) {
</span><span class="cx"> $wp_list_table = get_list_table('WP_Post_Comments_List_Table');
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.dev.js (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.dev.js 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/js/edit-comments.dev.js 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx">
</span><span class="cx"> refillTheExtraList();
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> var refillTheExtraList = function(ev) {
</span><span class="cx"> var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (args.paged > total_pages) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> args.number = 1;
</span><span class="cx"> args.offset = per_page - 1; // fetch only the last item of the next page
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> args.no_placeholder = true;
</span><span class="cx">
</span><span class="cx"> args.paged ++;
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
</span><del>-
</del><ins>+
</ins><span class="cx"> $(listTable).bind('beforeChangePage', function(){
</span><span class="cx"> commentReply.close();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/js/list-table.dev.js 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> listTable.update_rows({'paged': paged}, false, function() {
</span><span class="cx"> if ( $el.parents('.tablenav.bottom').length )
</span><span class="cx"> scrollTo(0, 0);
</span><del>-
</del><ins>+
</ins><span class="cx"> $(listTable).trigger('changePage');
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -256,20 +256,20 @@
</span><span class="cx"> if ( $('h2.nav-tab-wrapper').length )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) {
</del><ins>+ if ( 'site-users-network' == pagenow || 'site-themes-network' == pagenow ) {
</ins><span class="cx"> $('h4.search-text').remove();
</span><span class="cx">
</span><span class="cx"> if ( data.s )
</span><del>- $('ul.subsubsub').after($('<h4 class="clear search-text">').html(
- listTableL10n.search.replace('%s', this.htmlencode(data.s))
</del><ins>+ $('ul.subsubsub').after($('<h4 class="clear search-text">').html(
+ listTableL10n.search.replace('%s', this.htmlencode(data.s))
</ins><span class="cx"> ));
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx"> $('h2 .subtitle').remove();
</span><span class="cx">
</span><del>- if ( data.s )
- $('h2').append($('<span class="subtitle">').html(
- listTableL10n.search.replace('%s', this.htmlencode(data.s))
- ));
</del><ins>+ if ( data.s )
+ $('h2').append($('<span class="subtitle">').html(
+ listTableL10n.search.replace('%s', this.htmlencode(data.s))
+ ));
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-admin/post.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> $parent_file = "edit.php";
</span><span class="cx"> $submenu_file = "edit.php";
</span><span class="cx"> } else {
</span><del>- if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
</del><ins>+ if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
</ins><span class="cx"> $parent_file = $post_type_object->show_in_menu;
</span><span class="cx"> else
</span><span class="cx"> $parent_file = "edit.php?post_type=$post_type";
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/admin-bar.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> $pref = get_user_option( "show_admin_bar_{$context}", $user );
</span><span class="cx"> if ( false === $pref )
</span><span class="cx"> return 'admin' != $context || is_multisite();
</span><del>-
</del><ins>+
</ins><span class="cx"> return 'true' === $pref;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/formatting.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -1313,11 +1313,11 @@
</span><span class="cx"> function _make_url_clickable_cb($matches) {
</span><span class="cx"> $url = $matches[2];
</span><span class="cx"> $suffix = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> /** Include parentheses in the URL only if paired **/
</span><span class="cx"> while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
</span><del>- $suffix = strrchr( $url, ')' ) . $suffix;
- $url = substr( $url, 0, strrpos( $url, ')' ) );
</del><ins>+ $suffix = strrchr( $url, ')' ) . $suffix;
+ $url = substr( $url, 0, strrpos( $url, ')' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $url = esc_url($url);
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkcsswplinkdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/css/wplink.dev.css (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/css/wplink.dev.css 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/css/wplink.dev.css 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-link ol,
</span><del>-#wp-link ul {
</del><ins>+#wp-link ul {
</ins><span class="cx"> list-style: none;
</span><span class="cx"> margin: 0;
</span><del>- padding: 0;
</del><ins>+ padding: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #wp-link input[type="text"] {
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkjswplinkdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -251,14 +251,14 @@
</span><span class="cx"> // We're about to toggle visibility; it's currently the opposite
</span><span class="cx"> visible = !panel.is(':visible'),
</span><span class="cx"> win = $(window);
</span><del>-
</del><ins>+
</ins><span class="cx"> $(this).toggleClass('toggle-arrow-active', visible);
</span><del>-
</del><ins>+
</ins><span class="cx"> inputs.dialog.height('auto');
</span><span class="cx"> panel.slideToggle( 300, function() {
</span><span class="cx"> setUserSetting('wplink', visible ? '1' : '0');
</span><span class="cx"> inputs[ visible ? 'search' : 'url' ].focus();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Move the box if the box is now expanded, was opened in a collapsed state,
</span><span class="cx"> // and if it needs to be moved. (Judged by bottom not being positive or
</span><span class="cx"> // bottom being smaller than top.)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> top = widget.offset().top,
</span><span class="cx"> bottom = top + widget.outerHeight(),
</span><span class="cx"> diff = bottom - win.height();
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( diff > scroll ) {
</span><span class="cx"> widget.animate({'top': diff < top ? top - diff : scroll }, 200);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesjswplistsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-lists.dev.js (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-lists.dev.js 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/js/wp-lists.dev.js 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> process: function(el) {
</span><span class="cx"> var list = this,
</span><span class="cx"> $el = $(el || document);
</span><del>-
</del><ins>+
</ins><span class="cx"> $el.delegate( "form[class^=add:" + list.id + ":]", 'submit', function(){
</span><span class="cx"> return list.wpList.add(this);
</span><span class="cx"> });
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> $el.delegate( "[class^=add:" + list.id + ":]:not(form)", 'click', function(){
</span><span class="cx"> return list.wpList.add(this);
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $el.delegate( "[class^=delete:" + list.id + ":]", 'click', function(){
</span><span class="cx"> return list.wpList.del(this);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/kses.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> * with this program; if not, write to the Free Software Foundation, Inc.,
</span><span class="cx"> * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit
</span><span class="cx"> * http://www.gnu.org/licenses/gpl.html
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * [kses strips evil scripts!]
</span><span class="cx"> *
</span><span class="cx"> * Added wp_ prefix to avoid conflicts with existing kses users
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/link-template.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -274,8 +274,8 @@
</span><span class="cx"> $draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
</span><span class="cx">
</span><span class="cx"> $link = $wp_rewrite->get_page_permastruct();
</span><del>-
- if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
</del><ins>+
+ if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
</ins><span class="cx"> if ( ! $leavename ) {
</span><span class="cx"> $link = str_replace('%pagename%', get_page_uri($id), $link);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/ms-functions.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx"> * This function checks against the Banned Email Domains list
</span><span class="cx"> * at wp-admin/network/settings.php. The check is only run on
</span><span class="cx"> * self-registrations; user creation at wp-admin/network/users.php
</span><del>- * bypasses this check.
</del><ins>+ * bypasses this check.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> * $user parameter to the function, where $user is the other user, is
</span><span class="cx"> * effectively an override of this limitation.
</span><span class="cx"> *
</span><del>- * Filter 'wpmu_validate_blog_signup' if you want to modify
</del><ins>+ * Filter 'wpmu_validate_blog_signup' if you want to modify
</ins><span class="cx"> * the way that WordPress validates new site signups.
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="lines">@@ -1577,11 +1577,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Check an array of MIME types against a whitelist.
</span><span class="cx"> *
</span><del>- * WordPress ships with a set of allowed upload filetypes,
</del><ins>+ * WordPress ships with a set of allowed upload filetypes,
</ins><span class="cx"> * which is defined in wp-includes/functions.php in
</span><span class="cx"> * get_allowed_mime_types(). This function is used to filter
</span><del>- * that list against the filetype whitelist provided by Multisite
- * Super Admins at wp-admin/network/settings.php.
</del><ins>+ * that list against the filetype whitelist provided by Multisite
+ * Super Admins at wp-admin/network/settings.php.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="lines">@@ -1806,7 +1806,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> * @uses add_existing_user_to_blog()
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function maybe_add_existing_user_to_blog() {
</span><span class="cx"> if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1832,9 +1832,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> * @uses add_user_to_blog()
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param array $details
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function add_existing_user_to_blog( $details = false ) {
</span><span class="cx"> global $blog_id;
</span><span class="cx">
</span><span class="lines">@@ -1849,11 +1849,11 @@
</span><span class="cx"> * Add a newly created user to the appropriate blog
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $user_id
</span><span class="cx"> * @param string $email
</span><span class="cx"> * @param array $meta
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function add_new_user_to_blog( $user_id, $email, $meta ) {
</span><span class="cx"> global $current_site;
</span><span class="cx"> if ( $meta[ 'add_to_blog' ] ) {
</span><span class="lines">@@ -1869,7 +1869,7 @@
</span><span class="cx"> * Correct From host on outgoing mail to match the site domain
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function fix_phpmailer_messageid( $phpmailer ) {
</span><span class="cx"> global $current_site;
</span><span class="cx"> $phpmailer->Hostname = $current_site->domain;
</span><span class="lines">@@ -1884,7 +1884,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $username
</span><span class="cx"> * @return bool
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function is_user_spammy( $username = 0 ) {
</span><span class="cx"> if ( $username == 0 ) {
</span><span class="cx"> $user_id = get_current_user_id();
</span><span class="lines">@@ -1907,7 +1907,7 @@
</span><span class="cx"> * @param int $old_value
</span><span class="cx"> * @param int $value The new public value
</span><span class="cx"> * @return bool
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function update_blog_public( $old_value, $value ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> do_action('update_blog_public');
</span><span class="lines">@@ -1922,7 +1922,7 @@
</span><span class="cx"> * @uses get_blog_details()
</span><span class="cx"> *
</span><span class="cx"> * @return int
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function get_dashboard_blog() {
</span><span class="cx"> if ( $blog = get_site_option( 'dashboard_blog' ) )
</span><span class="cx"> return get_blog_details( $blog );
</span><span class="lines">@@ -1940,7 +1940,7 @@
</span><span class="cx"> * @param int $user_id Optional. Defaults to current user.
</span><span class="cx"> * @param int $blog_id Optional. Defaults to current blog.
</span><span class="cx"> * @return bool
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="lines">@@ -1964,7 +1964,7 @@
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="cx"> * @return bool
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function users_can_register_signup_filter() {
</span><span class="cx"> $registration = get_site_option('registration');
</span><span class="cx"> if ( $registration == 'all' || $registration == 'user' )
</span><span class="lines">@@ -1981,7 +1981,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $text
</span><span class="cx"> * @return string
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> function welcome_user_msg_filter( $text ) {
</span><span class="cx"> if ( !$text ) {
</span><span class="cx"> return __( 'Dear User,
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/nav-menu-template.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> 'taxonomy' == $parent_item->type &&
</span><span class="cx"> isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
</span><span class="cx"> in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
</span><del>- (
</del><ins>+ (
</ins><span class="cx"> ! isset( $queried_object->term_id ) ||
</span><span class="cx"> $parent_item->object_id != $queried_object->term_id
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/post.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -619,9 +619,9 @@
</span><span class="cx"> * public - Whether posts of this status should be shown in the front end of the site. Defaults to true.
</span><span class="cx"> * exclude_from_search - Whether to exclude posts with this post status from search results. Defaults to true.
</span><span class="cx"> * show_in_admin_all_list - Whether to include posts in the edit listing for their post type
</span><del>- * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit
</del><ins>+ * show_in_admin_status_list - Show in the list of statuses with post counts at the top of the edit
</ins><span class="cx"> * listings, e.g. All (12) | Published (9) | My Custom Status (2) ...
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Arguments prefixed with an _underscore shouldn't be used by plugins and themes.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/taxonomy.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -2912,7 +2912,7 @@
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, array(
</span><span class="cx"> 'template' => '%s: %l.',
</span><del>- ) );
</del><ins>+ ) );
</ins><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> $taxonomies = array();
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/theme.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -1754,7 +1754,7 @@
</span><span class="cx"> $_wp_theme_features[$feature] = true;
</span><span class="cx"> else
</span><span class="cx"> $_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $feature == 'post-formats' && is_array( $_wp_theme_features[$feature][0] ) )
</span><span class="cx"> $_wp_theme_features[$feature][0] = array_intersect( $_wp_theme_features[$feature][0], array_keys( get_post_format_slugs() ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-01-06 04:08:23 UTC (rev 17227)
+++ trunk/wp-includes/user.php 2011-01-06 04:11:14 UTC (rev 17228)
</span><span class="lines">@@ -1457,10 +1457,10 @@
</span><span class="cx">
</span><span class="cx"> if ( empty($user_registered) )
</span><span class="cx"> $user_registered = gmdate('Y-m-d H:i:s');
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($show_admin_bar_front) )
</span><span class="cx"> $show_admin_bar_front = 'true';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($show_admin_bar_admin) )
</span><span class="cx"> $show_admin_bar_admin = is_multisite() ? 'true' : 'false';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>