<!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>[13316] trunk: Whitespace cleanup</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13316">13316</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-02-22 23:12:48 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadminimportwordpressphp">trunk/wp-admin/import/wordpress.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
<li><a href="#trunkwpincludespomomophp">trunk/wp-includes/pomo/mo.php</a></li>
<li><a href="#trunkwpincludespomopophp">trunk/wp-includes/pomo/po.php</a></li>
<li><a href="#trunkwpincludespomostreamsphp">trunk/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunkwpincludespomotranslationsphp">trunk/wp-includes/pomo/translations.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-admin/custom-background.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( get_background_image() ) : ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h2><?php _e('Change Display Options') ?></h2>
</span><span class="cx"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
</span><span class="cx"> <table>
</span></span></pre></div>
<a id="trunkwpadminimportwordpressphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/wordpress.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/wordpress.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-admin/import/wordpress.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> if ( !$user_id ) {
</span><span class="cx"> $user_id = wp_create_user($new_author_name, wp_generate_password());
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !is_wp_error( $user_id ) ) {
</span><span class="cx"> $this->author_ids[$in_author_name] = $user_id;
</span><span class="cx"> }
</span><span class="lines">@@ -343,16 +343,16 @@
</span><span class="cx"> $tag_ID = wp_insert_term($tag_name, 'post_tag', $tagarr);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function process_terms() {
</span><span class="cx"> global $wpdb, $wp_taxonomies;
</span><del>-
</del><ins>+
</ins><span class="cx"> $custom_taxonomies = $wp_taxonomies;
</span><span class="cx"> // get rid of the standard taxonomies
</span><span class="cx"> unset( $custom_taxonomies['category'] );
</span><span class="cx"> unset( $custom_taxonomies['post_tag'] );
</span><span class="cx"> unset( $custom_taxonomies['link_category'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> $custom_taxonomies = array_keys( $custom_taxonomies );
</span><span class="cx"> $current_terms = (array) get_terms( $custom_taxonomies, array('get' => 'all') );
</span><span class="cx"> $taxonomies = array();
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> $value = stripslashes($value); // add_post_meta() will escape.
</span><span class="cx"> // get_post_meta would have done this but we read straight from the db on export so we could have a serialized string
</span><span class="cx"> $value = maybe_unserialize($value);
</span><del>-
</del><ins>+
</ins><span class="cx"> $this->process_post_meta($post_id, $key, $value);
</span><span class="cx">
</span><span class="cx"> } }
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-admin/includes/template.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -3218,7 +3218,7 @@
</span><span class="cx"> function settings_errors ( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
</span><span class="cx">
</span><span class="cx"> if ($hide_on_update AND $_GET['updated']) return;
</span><del>-
</del><ins>+
</ins><span class="cx"> $settings_errors = get_settings_errors( $setting, $sanitize );
</span><span class="cx">
</span><span class="cx"> if ( !is_array($settings_errors) ) return;
</span></span></pre></div>
<a id="trunkwpcontentblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/blogs.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-content/blogs.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -5,11 +5,11 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Multisite
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> define( 'SHORTINIT', true );
</span><span class="cx"> require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> /** Load Multisite upload handler. */
</span><span class="cx"> require_once( ABSPATH . WPINC . '/ms-files.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludespomomophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/mo.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/mo.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-includes/pomo/mo.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> return $this->import_from_reader($reader);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_to_file($filename) {
</span><span class="cx"> $fh = fopen($filename, 'wb');
</span><span class="cx"> if ( !$fh ) return false;
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> fwrite($fh, pack('V*', $magic, $revision, $total, $originals_lenghts_addr,
</span><span class="cx"> $translations_lenghts_addr, $size_of_hash, $hash_addr));
</span><span class="cx"> fseek($fh, $originals_lenghts_addr);
</span><del>-
</del><ins>+
</ins><span class="cx"> // headers' msgid is an empty string
</span><span class="cx"> fwrite($fh, pack('VV', 0, $current_addr));
</span><span class="cx"> $current_addr++;
</span><span class="lines">@@ -55,24 +55,24 @@
</span><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1; // account for the NULL byte after
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $exported_headers = $this->export_headers();
</span><span class="cx"> fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
</span><span class="cx"> $current_addr += strlen($exported_headers) + 1;
</span><span class="cx"> $translations_table = $exported_headers . chr(0);
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach($entries as $entry) {
</span><span class="cx"> $translations_table .= $this->export_translations($entry) . chr(0);
</span><span class="cx"> $length = strlen($this->export_translations($entry));
</span><span class="cx"> fwrite($fh, pack('VV', $length, $current_addr));
</span><span class="cx"> $current_addr += $length + 1;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> fwrite($fh, $originals_table);
</span><span class="cx"> fwrite($fh, $translations_table);
</span><span class="cx"> fclose($fh);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_original($entry) {
</span><span class="cx"> //TODO: warnings for control characters
</span><span class="cx"> $exported = $entry->singular;
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
</span><span class="cx"> return $exported;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_translations($entry) {
</span><span class="cx"> //TODO: warnings for control characters
</span><span class="cx"> return implode(chr(0), $entry->translations);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function export_headers() {
</span><span class="cx"> $exported = '';
</span><span class="cx"> foreach($this->headers as $header => $value) {
</span></span></pre></div>
<a id="trunkwpincludespomopophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/po.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/po.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-includes/pomo/po.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> */
</span><span class="cx"> if ( !class_exists( 'PO' ) ):
</span><span class="cx"> class PO extends Gettext_Translations {
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Exports headers to a PO entry
</span><span class="cx"> *
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> $po = str_replace("$newline$quote$quote", '', $po);
</span><span class="cx"> return $po;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Gives back the original string from a PO-formatted string
</span><span class="cx"> *
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> PO::read_line($f, 'clear');
</span><span class="cx"> return $res !== false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_entry($f, $lineno = 0) {
</span><span class="cx"> $entry = new Translation_Entry();
</span><span class="cx"> // where were we in the last step
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> }
</span><span class="cx"> return array('entry' => $entry, 'lineno' => $lineno);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_line($f, $action = 'read') {
</span><span class="cx"> static $last_line = '';
</span><span class="cx"> static $use_last_line = false;
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> $use_last_line = false;
</span><span class="cx"> return $line;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_comment_to_entry(&$entry, $po_comment_line) {
</span><span class="cx"> $first_two = substr($po_comment_line, 0, 2);
</span><span class="cx"> $comment = trim(substr($po_comment_line, 2));
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> $entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function trim_quotes($s) {
</span><span class="cx"> if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
</span><span class="cx"> if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
</span></span></pre></div>
<a id="trunkwpincludespomostreamsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/streams.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/streams.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-includes/pomo/streams.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -10,15 +10,15 @@
</span><span class="cx">
</span><span class="cx"> if ( !class_exists( 'POMO_Reader' ) ):
</span><span class="cx"> class POMO_Reader {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $endian = 'little';
</span><span class="cx"> var $_post = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function POMO_Reader() {
</span><span class="cx"> $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
</span><span class="cx"> $this->_pos = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Sets the endianness of the file.
</span><span class="cx"> *
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx"> $endian_letter = ('big' == $this->endian)? 'N' : 'V';
</span><span class="cx"> return unpack($endian_letter.$count, $bytes);
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function substr($string, $start, $length) {
</span><span class="cx"> if ($this->is_overloaded) {
</span><span class="cx"> return mb_substr($string, $start, $length, 'ascii');
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> return substr($string, $start, $length);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function strlen($string) {
</span><span class="cx"> if ($this->is_overloaded) {
</span><span class="cx"> return mb_strlen($string, 'ascii');
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> return strlen($string);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function str_split($string, $chunk_size) {
</span><span class="cx"> if (!function_exists('str_split')) {
</span><span class="cx"> $length = $this->strlen($string);
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx"> return str_split( $string, $chunk_size );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> function pos() {
</span><span class="cx"> return $this->_pos;
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> function is_resource() {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function close() {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx"> parent::POMO_Reader();
</span><span class="cx"> $this->_f = fopen($filename, 'r');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read($bytes) {
</span><span class="cx"> return fread($this->_f, $bytes);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function seekto($pos) {
</span><span class="cx"> if ( -1 == fseek($this->_f, $pos, SEEK_SET)) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -120,19 +120,19 @@
</span><span class="cx"> $this->_pos = $pos;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function is_resource() {
</span><span class="cx"> return is_resource($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function feof() {
</span><span class="cx"> return feof($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function close() {
</span><span class="cx"> return fclose($this->_f);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function read_all() {
</span><span class="cx"> $all = '';
</span><span class="cx"> while ( !$this->feof() )
</span><span class="lines">@@ -148,9 +148,9 @@
</span><span class="cx"> * of a physical file.
</span><span class="cx"> */
</span><span class="cx"> class POMO_StringReader extends POMO_Reader {
</span><del>-
</del><ins>+
</ins><span class="cx"> var $_str = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> function POMO_StringReader($str = '') {
</span><span class="cx"> parent::POMO_Reader();
</span><span class="cx"> $this->_str = $str;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> function read_all() {
</span><span class="cx"> return $this->substr($this->_str, $this->_pos, $this->strlen($this->_str));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/translations.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/translations.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-includes/pomo/translations.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx"> return call_user_func($this->_gettext_select_plural_form, $count);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function nplurals_and_expression_from_header($header) {
</span><span class="cx"> if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
</span><span class="cx"> $nplurals = (int)$matches[1];
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> }
</span><span class="cx"> return rtrim($res, ';');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function make_headers($translation) {
</span><span class="cx"> $headers = array();
</span><span class="cx"> // sometimes \ns are used instead of real new lines
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> }
</span><span class="cx"> return $headers;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function set_header($header, $value) {
</span><span class="cx"> parent::set_header($header, $value);
</span><span class="cx"> if ('Plural-Forms' == $header) {
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> class NOOP_Translations {
</span><span class="cx"> var $entries = array();
</span><span class="cx"> var $headers = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> function add_entry($entry) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13315 => 13316)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-22 22:54:21 UTC (rev 13315)
+++ trunk/wp-includes/post.php 2010-02-22 23:12:48 UTC (rev 13316)
</span><span class="lines">@@ -3138,7 +3138,7 @@
</span><span class="cx">
</span><span class="cx"> $post_type = 'attachment';
</span><span class="cx"> $post_status = 'inherit';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Make sure we set a valid category.
</span><span class="cx"> if ( !isset($post_category) || 0 == count($post_category) || !is_array($post_category) ) {
</span><span class="cx"> // 'post' requires at least one category.
</span></span></pre>
</div>
</div>
</body>
</html>