<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11971] trunk: Remove trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11971">11971</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-09-24 17:19:13 +0000 (Thu, 24 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimportphp">trunk/wp-admin/includes/import.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="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/import.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/import.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-admin/includes/import.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx"> */
</span><span class="cx"> function wp_import_handle_upload() {
</span><span class="cx"> if ( !isset($_FILES['import']) ) {
</span><del>- $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
</del><ins>+ $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
</ins><span class="cx"> return $file;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $overrides = array( 'test_form' => false, 'test_type' => false );
</span><span class="cx"> $_FILES['import']['name'] .= '.txt';
</span><span class="cx"> $file = wp_handle_upload( $_FILES['import'], $overrides );
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-admin/includes/plugin.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -347,12 +347,12 @@
</span><span class="cx"> continue;
</span><span class="cx"> if ( ! $silent )
</span><span class="cx"> do_action( 'deactivate_plugin', trim( $plugin ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $key = array_search( $plugin, (array) $current );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( false !== $key )
</span><span class="cx"> array_splice( $current, $key, 1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
</span><span class="cx"> if ( ! $silent ) {
</span><span class="cx"> do_action( 'deactivate_' . trim( $plugin ) );
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function validate_active_plugins() {
</span><del>- $check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
</del><ins>+ $check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
</ins><span class="cx">
</span><span class="cx"> // Sanity check. If the active plugin list is not an array, make it an
</span><span class="cx"> // empty array.
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-admin/includes/post.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx">
</span><span class="cx"> $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", $post_ID, $metakey, $metavalue) );
</span><span class="cx"> do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, $metakey, $metavalue );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-admin/press-this.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
</span><span class="cx"> if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote(htmlspecialchars($image), '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // set the post_content and status
</span><span class="cx"> $quick['post_status'] = isset($_POST['publish']) ? 'publish' : 'draft';
</span><span class="cx"> $quick['post_content'] = $content;
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-admin/upload.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
</span><span class="cx"> </h2>
</span><span class="cx">
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> $message = '';
</span><span class="cx"> if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
</span><span class="cx"> $_GET['message'] = '1';
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-includes/comment.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -863,8 +863,8 @@
</span><span class="cx"> do_action('trash_comment', $comment_id);
</span><span class="cx">
</span><span class="cx"> add_comment_meta($comment_id,'_wp_trash_meta_status', $comment->comment_approved);
</span><del>- add_comment_meta($comment_id,'_wp_trash_meta_time', time() );
-
</del><ins>+ add_comment_meta($comment_id,'_wp_trash_meta_time', time() );
+
</ins><span class="cx"> wp_set_comment_status($comment_id, 'trash');
</span><span class="cx">
</span><span class="cx"> do_action('trashed_comment', $comment_id);
</span><span class="lines">@@ -886,7 +886,7 @@
</span><span class="cx"> do_action('untrash_comment', $comment_id);
</span><span class="cx">
</span><span class="cx"> $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0');
</span><del>-
</del><ins>+
</ins><span class="cx"> //Either set comment_approved to the value in comment_meta or worse case to false which will mean moderation
</span><span class="cx"> $comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-includes/functions.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -3385,7 +3385,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( (array) $comments_to_delete as $comment ) {
</span><span class="cx"> wp_delete_comment($comment['comment_id']);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-includes/meta.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -24,15 +24,15 @@
</span><span class="cx"> $meta_key = stripslashes($meta_key);
</span><span class="cx">
</span><span class="cx"> if ( $unique && $wpdb->get_var( $wpdb->prepare(
</span><del>- "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
</del><ins>+ "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
</ins><span class="cx"> $meta_key, $object_id ) ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</span><span class="cx">
</span><span class="cx"> $wpdb->insert( $table, array(
</span><del>- $column => $object_id,
- 'meta_key' => $meta_key,
</del><ins>+ $column => $object_id,
+ 'meta_key' => $meta_key,
</ins><span class="cx"> 'meta_value' => $meta_value
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
</span><span class="cx">
</span><span class="cx"> $query = $wpdb->prepare( "SELECT meta_id FROM $table WHERE meta_key = %s", $meta_key );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $meta_value )
</span><span class="cx"> $query .= $wpdb->prepare("AND meta_value = %s", $meta_value );
</span><span class="cx">
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $query = "DELETE FROM $table WHERE meta_id IN( " . implode( ',', $meta_ids ) . " )";
</span><del>-
</del><ins>+
</ins><span class="cx"> $count = $wpdb->query($query);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !$count )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> // Get meta info
</span><span class="cx"> $id_list = join(',', $ids);
</span><span class="cx"> $cache = array();
</span><del>- $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
</del><ins>+ $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
</ins><span class="cx"> $meta_type), ARRAY_A );
</span><span class="cx">
</span><span class="cx"> if ( !empty($meta_list) ) {
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-includes/taxonomy.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -1689,7 +1689,7 @@
</span><span class="cx"> do_action( 'edit_term_taxonomy', $tt_id );
</span><span class="cx"> $wpdb->update( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent' ), array( 'term_taxonomy_id' => $tt_id ) );
</span><span class="cx"> do_action( 'edited_term_taxonomy', $tt_id );
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action("edit_term", $term_id, $tt_id);
</span><span class="cx"> do_action("edit_$taxonomy", $term_id, $tt_id);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (11970 => 11971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-09-24 17:16:34 UTC (rev 11970)
+++ trunk/wp-includes/theme.php 2009-09-24 17:19:13 UTC (rev 11971)
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @access private
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function _preview_theme_template_filter() {
</span><span class="lines">@@ -916,10 +916,10 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Private function to modify the current stylesheet when previewing a theme
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @access private
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function _preview_theme_stylesheet_filter() {
</span></span></pre>
</div>
</div>
</body>
</html>