<!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>[12733] trunk: Trailing whitespace cleanup</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12733">12733</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-15 22:11:12 +0000 (Fri, 15 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Trailing whitespace cleanup</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpadmincategoriesphp">trunk/wp-admin/categories.php</a></li>
<li><a href="#trunkwpadmincsswpadminrtlcss">trunk/wp-admin/css/wp-admin-rtl.css</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludescommentphp">trunk/wp-admin/includes/comment.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="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.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="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadminjswidgetsdevjs">trunk/wp-admin/js/widgets.dev.js</a></li>
<li><a href="#trunkwpadminjswpgearsdevjs">trunk/wp-admin/js/wp-gears.dev.js</a></li>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.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="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpconfigsamplephp">trunk/wp-config-sample.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesjsautosavedevjs">trunk/wp-includes/js/autosave.dev.js</a></li>
<li><a href="#trunkwpincludesjsquicktagsdevjs">trunk/wp-includes/js/quicktags.dev.js</a></li>
<li><a href="#trunkwpincludesjswplistrevisionsdevjs">trunk/wp-includes/js/wp-list-revisions.dev.js</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.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>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-activate.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> 
</span><span class="cx"> function wpmu_activate_stylesheet() {
</span><span class="cx">         ?&gt;
</span><del>-        &lt;style type=&quot;text/css&quot;&gt;        
</del><ins>+        &lt;style type=&quot;text/css&quot;&gt;
</ins><span class="cx">                 form { margin-top: 2em; }
</span><span class="cx">                 #submit, #key { width: 90%; font-size: 24px; }
</span><span class="cx">                 #language { margin-top: .5em; }
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;div id=&quot;content&quot; class=&quot;widecolumn&quot;&gt;
</span><span class="cx">         &lt;?php if ( empty($_GET['key']) &amp;&amp; empty($_POST['key']) ) { ?&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 &lt;h2&gt;&lt;?php _e('Activation Key Required') ?&gt;&lt;/h2&gt;
</span><span class="cx">                 &lt;form name=&quot;activateform&quot; id=&quot;activateform&quot; method=&quot;post&quot; action=&quot;&lt;?php echo 'http://' . $current_site-&gt;domain . $current_site-&gt;path ?&gt;wp-activate.php&quot;&gt;
</span><span class="cx">                         &lt;p&gt;
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx">                             &lt;input id=&quot;submit&quot; type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Activate') ?&gt;&quot; /&gt;
</span><span class="cx">                         &lt;/p&gt;
</span><span class="cx">                 &lt;/form&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">         &lt;?php } else {
</span><span class="cx"> 
</span><span class="cx">                 $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
</span><del>-                $result = wpmu_activate_signup($key);                
</del><ins>+                $result = wpmu_activate_signup($key);
</ins><span class="cx">                 if ( is_wp_error($result) ) {
</span><span class="cx">                         if ( 'already_active' == $result-&gt;get_error_code() || 'blog_taken' == $result-&gt;get_error_code() ) {
</span><span class="cx">                             $signup = $result-&gt;get_error_data();
</span><span class="lines">@@ -69,18 +69,18 @@
</span><span class="cx">                         $user = new WP_User( (int) $user_id);
</span><span class="cx">                         ?&gt;
</span><span class="cx">                         &lt;h2&gt;&lt;?php _e('Your account is now active!'); ?&gt;&lt;/h2&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;div id=&quot;signup-welcome&quot;&gt;
</span><span class="cx">                                 &lt;p&gt;&lt;span class=&quot;h3&quot;&gt;&lt;?php _e('Username:'); ?&gt;&lt;/span&gt; &lt;?php echo $user-&gt;user_login ?&gt;&lt;/p&gt;
</span><span class="cx">                                 &lt;p&gt;&lt;span class=&quot;h3&quot;&gt;&lt;?php _e('Password:'); ?&gt;&lt;/span&gt; &lt;?php echo $password; ?&gt;&lt;/p&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                         &lt;?php if( $url != 'http://' . $current_site-&gt;domain . $current_site-&gt;path ) : ?&gt;
</span><span class="cx">                                 &lt;p class=&quot;view&quot;&gt;&lt;?php printf(__('Your account is now activated. &lt;a href=&quot;%1$s&quot;&gt;View your site&lt;/a&gt; or &lt;a href=&quot;%2$s&quot;&gt;Login&lt;/a&gt;'), $url, $url . 'wp-login.php' ); ?&gt;&lt;/p&gt;
</span><span class="cx">                         &lt;?php else: ?&gt;
</span><span class="cx">                                 &lt;p class=&quot;view&quot;&gt;&lt;?php printf( __( 'Your account is now activated. &lt;a href=&quot;%1$s&quot;&gt;Login&lt;/a&gt; or go back to the &lt;a href=&quot;%2$s&quot;&gt;homepage&lt;/a&gt;.' ), 'http://' . $current_site-&gt;domain . $current_site-&gt;path . 'wp-login.php', 'http://' . $current_site-&gt;domain . $current_site-&gt;path ); ?&gt;&lt;/p&gt;
</span><span class="cx">                         &lt;?php endif;
</span><del>-                }                
</del><ins>+                }
</ins><span class="cx">         }
</span><span class="cx">         ?&gt;
</span><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/admin.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">                 exit;
</span><span class="cx">         } elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
</span><span class="cx">                 /**
</span><del>-                 * On really small MU installs run the upgrader every time, 
</del><ins>+                 * On really small MU installs run the upgrader every time,
</ins><span class="cx">                  * else run it less often to reduce load.
</span><span class="cx">                  *
</span><span class="cx">                  * @since 2.8.4b
</span></span></pre></div>
<a id="trunkwpadmincategoriesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/categories.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/categories.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/categories.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">         $submenu_file = &quot;categories.php?taxonomy=$taxonomy&amp;amp;post_type=$post_type&quot;;
</span><span class="cx"> } else {
</span><span class="cx">         $parent_file = 'edit.php';
</span><del>-        $submenu_file = &quot;categories.php?taxonomy=$taxonomy&quot;;        
</del><ins>+        $submenu_file = &quot;categories.php?taxonomy=$taxonomy&quot;;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadmincsswpadminrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.css (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.css        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/css/wp-admin-rtl.css        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">         margin-left: 1em;
</span><span class="cx"> }
</span><span class="cx"> .quicktags, .search {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> /* 200 - 500
</span><span class="cx"> =================================== */
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> .button-secondary,
</span><span class="cx"> .button-highlighted,
</span><span class="cx"> #postcustomstuff .submit input {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #wpcontent select {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #quicktags {
</span><span class="cx">         background-position: right top;
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">         margin-left: 0;
</span><span class="cx"> }
</span><span class="cx"> #your-profile legend {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #ajax-response.alignleft {
</span><span class="cx">         margin-left: 0;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> .tablenav .displaying-num {
</span><span class="cx">         margin-right: 0;
</span><span class="cx">         margin-left: 10px;
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #postcustomstuff table input,
</span><span class="cx"> #postcustomstuff table select,
</span><span class="lines">@@ -115,22 +115,22 @@
</span><span class="cx">         margin: 7px 15px 0 0;
</span><span class="cx"> }
</span><span class="cx"> #wphead h1 {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx">         float: right;
</span><span class="cx"> }
</span><span class="cx"> #wphead h1.long-title {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #adminmenu .wp-submenu a {
</span><span class="cx">         padding-left: 0;
</span><span class="cx">         padding-right: 12px;
</span><span class="cx">         border-width: 0 0 0 1px;
</span><span class="cx">         border-style: none none none solid;
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #adminmenu a.menu-top,
</span><span class="cx"> #adminmenu .wp-submenu-head {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> #adminmenu img.wp-menu-image {
</span><span class="cx">         float: right;
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> #adminmenu #awaiting-mod,
</span><span class="cx"> #adminmenu span.update-plugins,
</span><span class="cx"> #sidemenu li a span.update-plugins {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx">         margin-left: 0;
</span><span class="cx">         margin-right: 2px;
</span><span class="cx"> }
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">         float: right;
</span><span class="cx"> }
</span><span class="cx"> .post-com-count-wrapper {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> .column-response .post-com-count {
</span><span class="cx">         float: right;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         clear: right;
</span><span class="cx"> }
</span><span class="cx"> .description, .form-wrap p {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> /* 1500 - 1800
</span><span class="cx"> =================================== */
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">         float: left;
</span><span class="cx"> }
</span><span class="cx"> .howto {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> .postarea h3 label {
</span><span class="cx">         float: right;
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx">         margin-right: 10px;
</span><span class="cx"> }
</span><span class="cx"> .tool-box .title {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> .settings-toggle {
</span><span class="cx">         text-align: left;
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> #screen-options-link-wrap,
</span><span class="cx"> #contextual-help-link-wrap {
</span><span class="cx">         float: left;
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx">         margin: 0 0 0 6px;
</span><span class="cx"> }
</span><span class="cx"> .metabox-prefs label {
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> .inline-edit-row .catshow,
</span><span class="cx"> .inline-edit-row .cathide,
</span><span class="cx"> .inline-edit-row #bulk-titles div {
</span><del>-        font-family: Tahoma, Arial, sans-serif; 
</del><ins>+        font-family: Tahoma, Arial, sans-serif;
</ins><span class="cx"> }
</span><span class="cx"> .quick-edit-row-post fieldset label.inline-edit-status {
</span><span class="cx">         float: right;
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/edit-tags.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">         $submenu_file = &quot;edit-tags.php?taxonomy=$taxonomy&amp;amp;post_type=$post_type&quot;;
</span><span class="cx"> } else {
</span><span class="cx">         $parent_file = 'edit.php';
</span><del>-        $submenu_file = &quot;edit-tags.php?taxonomy=$taxonomy&quot;;        
</del><ins>+        $submenu_file = &quot;edit-tags.php?taxonomy=$taxonomy&quot;;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> if ( isset( $_GET['action'] ) &amp;&amp; isset($_GET['delete_tags']) &amp;&amp; ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">         function get_contents_array($file) {
</span><span class="cx">                 return explode(&quot;\n&quot;, $this-&gt;get_contents($file));
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         function put_contents($file, $contents, $mode = false ) {
</span><span class="cx">                 $temp = tmpfile();
</span><span class="cx">                 if ( ! $temp )
</span></span></pre></div>
<a id="trunkwpadminincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/comment.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/comment.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/comment.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx">                 else
</span><span class="cx">                         return absint($pending[0]['num_comments']);
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         $pending_keyed = array();
</span><del>-        
</del><ins>+
</ins><span class="cx">         // Default to zero pending for all posts in request
</span><span class="cx">         foreach ( $post_id_array as $id )
</span><span class="cx">                 $pending_keyed[$id] = 0;
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/dashboard.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( !$rss-&gt;get_item_quantity() ) {
</span><span class="cx">                 echo '&lt;p&gt;' . __('This dashboard widget queries &lt;a href=&quot;http://blogsearch.google.com/&quot;&gt;Google Blog Search&lt;/a&gt; so that when another blog links to your site it will show up here. It has found no incoming links&amp;hellip; yet. It&amp;#8217;s okay &amp;#8212; there is no rush.') . &quot;&lt;/p&gt;\n&quot;;
</span><del>-                $rss-&gt;__destruct(); 
</del><ins>+                $rss-&gt;__destruct();
</ins><span class="cx">                 unset($rss);
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         echo &quot;&lt;/ul&gt;\n&quot;;
</span><del>-        $rss-&gt;__destruct(); 
</del><ins>+        $rss-&gt;__destruct();
</ins><span class="cx">         unset($rss);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -748,14 +748,14 @@
</span><span class="cx">                         echo '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx">                 }
</span><span class="cx">         } elseif ( !$rss-&gt;get_item_quantity() ) {
</span><del>-                $rss-&gt;__destruct(); 
</del><ins>+                $rss-&gt;__destruct();
</ins><span class="cx">                 unset($rss);
</span><span class="cx">                 return false;
</span><span class="cx">         } else {
</span><span class="cx">                 echo '&lt;div class=&quot;rss-widget&quot;&gt;';
</span><span class="cx">                 wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
</span><span class="cx">                 echo '&lt;/div&gt;';
</span><del>-                $rss-&gt;__destruct(); 
</del><ins>+                $rss-&gt;__destruct();
</ins><span class="cx">                 unset($rss);
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx">                 echo &quot;&lt;h4&gt;$label&lt;/h4&gt;\n&quot;;
</span><span class="cx">                 echo &quot;&lt;h5&gt;&lt;a href='$link'&gt;$title&lt;/a&gt;&lt;/h5&gt;&amp;nbsp;&lt;span&gt;(&lt;a href='$ilink' class='thickbox' title='$title'&gt;&quot; . __( 'Install' ) . &quot;&lt;/a&gt;)&lt;/span&gt;\n&quot;;
</span><span class="cx">                 echo &quot;&lt;p&gt;$description&lt;/p&gt;\n&quot;;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $$feed-&gt;__destruct();
</span><span class="cx">                 unset($$feed);
</span><span class="cx">         }
</span><span class="lines">@@ -938,9 +938,9 @@
</span><span class="cx">                         if ( is_wp_error($rss) ) {
</span><span class="cx">                                 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
</span><span class="cx">                         } else {
</span><del>-                                $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss-&gt;get_title()));        
</del><ins>+                                $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss-&gt;get_title()));
</ins><span class="cx">                                 $rss-&gt;__destruct();
</span><del>-                                unset($rss);                                
</del><ins>+                                unset($rss);
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">                 update_option( 'dashboard_widget_options', $widget_options );
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/file.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> 
</span><span class="cx">         if  ( function_exists('sys_get_temp_dir') )
</span><span class="cx">                 return trailingslashit(sys_get_temp_dir());
</span><del>-        
</del><ins>+
</ins><span class="cx">         $temp = ini_get('upload_tmp_dir');
</span><span class="cx">         if ( is_dir($temp) ) // always writable
</span><span class="cx">                 return trailingslashit($temp);
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/image-edit.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">         &lt;div class=&quot;imgedit-menu&quot;&gt;
</span><span class="cx">                 &lt;div onclick=&quot;imageEdit.crop(&lt;?php echo &quot;$post_id, '$nonce'&quot;; ?&gt;, this)&quot; class=&quot;imgedit-crop disabled&quot; title=&quot;&lt;?php esc_attr_e( 'Crop' ); ?&gt;&quot;&gt;&lt;/div&gt;&lt;?php
</span><span class="cx"> 
</span><del>-        // On some setups GD library does not provide imagerotate() - Ticket #11536   
</del><ins>+        // On some setups GD library does not provide imagerotate() - Ticket #11536
</ins><span class="cx">         if ( function_exists('imagerotate') ) { ?&gt;
</span><span class="cx">                 &lt;div class=&quot;imgedit-rleft&quot;  onclick=&quot;imageEdit.rotate( 90, &lt;?php echo &quot;$post_id, '$nonce'&quot;; ?&gt;, this)&quot; title=&quot;&lt;?php esc_attr_e( 'Rotate counter-clockwise' ); ?&gt;&quot;&gt;&lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;imgedit-rright&quot; onclick=&quot;imageEdit.rotate(-90, &lt;?php echo &quot;$post_id, '$nonce'&quot;; ?&gt;, this)&quot; title=&quot;&lt;?php esc_attr_e( 'Rotate clockwise' ); ?&gt;&quot;&gt;&lt;/div&gt;
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">         &lt;div class=&quot;imgedit-group-top&quot;&gt;
</span><span class="cx">                 &lt;a class=&quot;imgedit-help-toggle&quot; onclick=&quot;imageEdit.toggleHelp(this);return false;&quot; href=&quot;#&quot;&gt;&lt;strong&gt;&lt;?php _e('Restore Original Image'); ?&gt;&lt;/strong&gt;&lt;/a&gt;
</span><span class="cx">                 &lt;div class=&quot;imgedit-help&quot;&gt;
</span><del>-                &lt;p&gt;&lt;?php _e('Discard any changes and restore the original image.'); 
</del><ins>+                &lt;p&gt;&lt;?php _e('Discard any changes and restore the original image.');
</ins><span class="cx"> 
</span><span class="cx">                 if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
</span><span class="cx">                         _e(' Previously edited copies of the image will not be deleted.');
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/media.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -1019,8 +1019,8 @@
</span><span class="cx"> 
</span><span class="cx">         $edit_post = sanitize_post($post, 'edit');
</span><span class="cx"> 
</span><del>-        
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx">         $form_fields = array(
</span><span class="cx">                 'post_title'   =&gt; array(
</span><span class="cx">                         'label'      =&gt; __('Title'),
</span><span class="lines">@@ -1223,11 +1223,11 @@
</span><span class="cx">                         &lt;p&gt;&lt;strong&gt;&quot; . __('Upload date:') . &quot;&lt;/strong&gt; &quot; . mysql2date( get_option('date_format'), $post-&gt;post_date ). '&lt;/p&gt;';
</span><span class="cx">                         if ( !empty( $media_dims ) )
</span><span class="cx">                                 $item .= &quot;&lt;p&gt;&lt;strong&gt;&quot; . __('Dimensions:') . &quot;&lt;/strong&gt; $media_dims&lt;/p&gt;\n&quot;;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         echo &quot;&lt;/td&gt;&lt;/tr&gt;\n&quot;;
</span><span class="cx"> 
</span><del>-        
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx">         $item .= &quot;
</span><span class="cx">                 &lt;/thead&gt;
</span><span class="cx">                 &lt;tbody&gt;
</span><span class="lines">@@ -1248,12 +1248,12 @@
</span><span class="cx">                         $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Delete Permanently' ) . '&lt;/a&gt;';
</span><span class="cx">                 } elseif ( !MEDIA_TRASH ) {
</span><span class="cx">                         $delete = &quot;&lt;a href='#' class='del-link' onclick=\&quot;document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\&quot;&gt;&quot; . __( 'Delete' ) . &quot;&lt;/a&gt;
</span><del>-                         &lt;div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'&gt;&quot; . sprintf( __( 'You are about to delete &lt;strong&gt;%s&lt;/strong&gt;.' ), $filename ) . &quot; 
-                         &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='button'&gt;&quot; . __( 'Continue' ) . &quot;&lt;/a&gt; 
</del><ins>+                         &lt;div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'&gt;&quot; . sprintf( __( 'You are about to delete &lt;strong&gt;%s&lt;/strong&gt;.' ), $filename ) . &quot;
+                         &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=delete&amp;amp;post=$attachment_id&quot;, 'delete-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='button'&gt;&quot; . __( 'Continue' ) . &quot;&lt;/a&gt;
</ins><span class="cx">                          &lt;a href='#' class='button' onclick=\&quot;this.parentNode.style.display='none';return false;\&quot;&gt;&quot; . __( 'Cancel' ) . &quot;&lt;/a&gt;
</span><span class="cx">                          &lt;/div&gt;&quot;;
</span><span class="cx">                 } else {
</span><del>-                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=trash&amp;amp;post=$attachment_id&quot;, 'trash-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Move to Trash' ) . &quot;&lt;/a&gt; 
</del><ins>+                        $delete = &quot;&lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=trash&amp;amp;post=$attachment_id&quot;, 'trash-post_' . $attachment_id ) . &quot;' id='del[$attachment_id]' class='delete'&gt;&quot; . __( 'Move to Trash' ) . &quot;&lt;/a&gt;
</ins><span class="cx">                         &lt;a href='&quot; . wp_nonce_url( &quot;post.php?action=untrash&amp;amp;post=$attachment_id&quot;, 'untrash-post_' . $attachment_id ) . &quot;' id='undo[$attachment_id]' class='undo hidden'&gt;&quot; . __( 'Undo' ) . &quot;&lt;/a&gt;&quot;;
</span><span class="cx">                 }
</span><span class="cx">         } else {
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/misc.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Resets global variables based on $_GET and $_POST
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * This function resets global variables based on the names passed
</span><span class="cx">  * in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
</span><span class="cx">  * if neither is defined.
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/plugin.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -67,15 +67,15 @@
</span><span class="cx">  */
</span><span class="cx"> function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
</span><span class="cx"> 
</span><del>-        $default_headers = array( 
-                'Name' =&gt; 'Plugin Name', 
-                'PluginURI' =&gt; 'Plugin URI', 
-                'Version' =&gt; 'Version', 
-                'Description' =&gt; 'Description', 
-                'Author' =&gt; 'Author', 
-                'AuthorURI' =&gt; 'Author URI', 
-                'TextDomain' =&gt; 'Text Domain', 
-                'DomainPath' =&gt; 'Domain Path' 
</del><ins>+        $default_headers = array(
+                'Name' =&gt; 'Plugin Name',
+                'PluginURI' =&gt; 'Plugin URI',
+                'Version' =&gt; 'Version',
+                'Description' =&gt; 'Description',
+                'Author' =&gt; 'Author',
+                'AuthorURI' =&gt; 'Author URI',
+                'TextDomain' =&gt; 'Text Domain',
+                'DomainPath' =&gt; 'Domain Path'
</ins><span class="cx">                 );
</span><span class="cx"> 
</span><span class="cx">         $plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/post.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -958,10 +958,10 @@
</span><span class="cx">  *
</span><span class="cx">  * @since unknown
</span><span class="cx">  *
</span><del>- * @param int|object $id    Post ID or post object. 
- * @param string $title (optional) Title 
- * @param string $name (optional) Name 
- * @return array With two entries of type string 
</del><ins>+ * @param int|object $id    Post ID or post object.
+ * @param string $title (optional) Title
+ * @param string $name (optional) Name
+ * @return array With two entries of type string
</ins><span class="cx">  */
</span><span class="cx"> function get_sample_permalink($id, $title = null, $name = null) {
</span><span class="cx">         $post = &amp;get_post($id);
</span><span class="lines">@@ -1015,13 +1015,13 @@
</span><span class="cx">  * sample permalink html
</span><span class="cx">  *
</span><span class="cx">  * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since unknown
</span><span class="cx">  *
</span><del>- * @param int|object $id Post ID or post object. 
- * @param string $new_title (optional) New title  
- * @param string $new_slug (optional) New slug 
- * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 
</del><ins>+ * @param int|object $id Post ID or post object.
+ * @param string $new_title (optional) New title
+ * @param string $new_slug (optional) New slug
+ * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
</ins><span class="cx">  */
</span><span class="cx"> function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
</span><span class="cx">         $post = &amp;get_post($id);
</span><span class="lines">@@ -1185,7 +1185,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @uses _wp_translate_postdata()
</span><span class="cx">  * @uses _wp_post_revision_fields()
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @return unknown
</span><span class="cx">  */
</span><span class="cx"> function wp_create_post_autosave( $post_id ) {
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/schema.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">                 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length');
</span><span class="cx">         foreach ($unusedoptions as $option)
</span><span class="cx">                 delete_option($option);
</span><del>-        
</del><ins>+
</ins><span class="cx">         // delete obsolete magpie stuff
</span><span class="cx">         $wpdb-&gt;query(&quot;DELETE FROM $wpdb-&gt;options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'&quot;);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/theme.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -156,10 +156,10 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Tidies a filename for url display by the theme editor.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  * @private
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @param string $fullpath Full path to the theme file
</span><span class="cx">  * @param string $containingfolder Path of the theme parent folder
</span><span class="cx">  * @return string
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/includes/widgets.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( !empty( $description ) ) {
</span><span class="cx">                 echo &quot;&lt;div class='sidebar-description'&gt;\n&quot;;
</span><del>-                echo &quot;\t&lt;p class='description'&gt;$description&lt;/p&gt;&quot;; 
</del><ins>+                echo &quot;\t&lt;p class='description'&gt;$description&lt;/p&gt;&quot;;
</ins><span class="cx">                 echo &quot;&lt;/div&gt;\n&quot;;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminjswidgetsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/widgets.dev.js (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/widgets.dev.js        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/js/widgets.dev.js        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $('a.widget-action').live('click', function(){
</span><span class="cx">                         var css = {}, widget = $(this).closest('div.widget'), inside = widget.children('.widget-inside'), w = parseInt( widget.find('input.widget-width').val(), 10 );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if ( inside.is(':hidden') ) {
</span><span class="cx">                                 if ( w &gt; 250 &amp;&amp; inside.closest('div.widgets-sortables').length ) {
</span><span class="cx">                                         css['width'] = w + 30 + 'px';
</span></span></pre></div>
<a id="trunkwpadminjswpgearsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/wp-gears.dev.js (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/wp-gears.dev.js        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/js/wp-gears.dev.js        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( host.match(/[^a-z0-9._-]/i) )
</span><span class="cx">                         host = encodeURIComponent(host);
</span><del>-                
</del><ins>+
</ins><span class="cx">                 name = window.location.protocol + host;
</span><span class="cx">                 name = name.replace(/[^a-z0-9._-]+/gi, '_');
</span><span class="cx">                 name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
</span></span></pre></div>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/menu-header.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> $self = preg_replace('|^.*/mu-plugins/|i', '', $self);
</span><span class="cx"> 
</span><span class="cx"> global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
</span><del>-$parent_file = apply_filters(&quot;parent_file&quot;, $parent_file); // For plugins to move submenu tabs around. 
</del><ins>+$parent_file = apply_filters(&quot;parent_file&quot;, $parent_file); // For plugins to move submenu tabs around.
</ins><span class="cx"> 
</span><span class="cx"> get_admin_page_parent();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/menu.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">                 $submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
</span><span class="cx">         elseif ( is_super_admin() || get_site_option( 'add_new_users' ) )
</span><span class="cx">                 $submenu['users.php'][10] = array(__('Add New') . ' &lt;strong&gt;*&lt;/strong&gt;', 'create_users', 'ms-options.php#addnewusers');
</span><del>-                
</del><ins>+
</ins><span class="cx">         $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
</span><span class="cx"> } else {
</span><span class="cx">         $_wp_real_parent_file['users.php'] = 'profile.php';
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/ms-sites.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -309,11 +309,11 @@
</span><span class="cx"> 
</span><span class="cx">         // List blogs
</span><span class="cx">         default:
</span><del>-                $apage = ( isset($_GET['apage'] ) &amp;&amp; intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1; 
-                $num = ( isset($_GET['num'] ) &amp;&amp; intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15; 
</del><ins>+                $apage = ( isset($_GET['apage'] ) &amp;&amp; intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
+                $num = ( isset($_GET['num'] ) &amp;&amp; intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15;
</ins><span class="cx">                 $s = wp_specialchars( trim( $_GET[ 's' ] ) );
</span><span class="cx">                 $like_s = like_escape($s);
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $query = &quot;SELECT * FROM {$wpdb-&gt;blogs} WHERE site_id = '{$wpdb-&gt;siteid}' &quot;;
</span><span class="cx"> 
</span><span class="cx">                 if( isset($_GET['blog_name']) ) {
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/options-general.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -300,14 +300,14 @@
</span><span class="cx"> 
</span><span class="cx"> if( is_array($lang_files) &amp;&amp; !empty($lang_files) ) {
</span><span class="cx">         ?&gt;
</span><del>-        &lt;tr valign=&quot;top&quot;&gt; 
-                &lt;th width=&quot;33%&quot; scope=&quot;row&quot;&gt;&lt;?php _e('Blog language:') ?&gt;&lt;/th&gt; 
</del><ins>+        &lt;tr valign=&quot;top&quot;&gt;
+                &lt;th width=&quot;33%&quot; scope=&quot;row&quot;&gt;&lt;?php _e('Blog language:') ?&gt;&lt;/th&gt;
</ins><span class="cx">                 &lt;td&gt;
</span><span class="cx">                         &lt;select name=&quot;WPLANG&quot; id=&quot;WPLANG&quot;&gt;
</span><span class="cx">                                 &lt;?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?&gt;
</span><span class="cx">                         &lt;/select&gt;
</span><span class="cx">                 &lt;/td&gt;
</span><del>-        &lt;/tr&gt; 
</del><ins>+        &lt;/tr&gt;
</ins><span class="cx">         &lt;?php
</span><span class="cx"> } // languages
</span><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/options-permalink.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">   &lt;/form&gt;
</span><span class="cx"> &lt;?php if ( !is_multisite || is_super_admin() ) { ?&gt;
</span><span class="cx"> &lt;?php if ($iis7_permalinks) :
</span><del>-        if ( isset($_POST['submit']) &amp;&amp; $permalink_structure &amp;&amp; ! $usingpi &amp;&amp; ! $writable ) : 
</del><ins>+        if ( isset($_POST['submit']) &amp;&amp; $permalink_structure &amp;&amp; ! $usingpi &amp;&amp; ! $writable ) :
</ins><span class="cx">                 if ( file_exists($home_path . 'web.config') ) : ?&gt;
</span><span class="cx"> &lt;p&gt;&lt;?php _e('If your &lt;code&gt;web.config&lt;/code&gt; file were &lt;a href=&quot;http://codex.wordpress.org/Changing_File_Permissions&quot;&gt;writable&lt;/a&gt;, we could do this automatically, but it isn&amp;#8217;t so this is the url rewrite rule you should have in your &lt;code&gt;web.config&lt;/code&gt; file. Click in the field and press &lt;kbd&gt;CTRL + a&lt;/kbd&gt; to select all. Then insert this rule inside of the &lt;code&gt;/&amp;lt;configuration&amp;gt;/&amp;lt;system.webServer&amp;gt;/&amp;lt;rewrite&amp;gt;/&amp;lt;rules&amp;gt;&lt;/code&gt; element in &lt;code&gt;web.config&lt;/code&gt; file.') ?&gt;&lt;/p&gt;
</span><span class="cx"> &lt;form action=&quot;options-permalink.php&quot; method=&quot;post&quot;&gt;
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> &lt;?php wp_nonce_field('update-permalink') ?&gt;
</span><span class="cx">         &lt;p&gt;&lt;textarea rows=&quot;18&quot; class=&quot;large-text readonly&quot; name=&quot;rules&quot; id=&quot;rules&quot; readonly=&quot;readonly&quot;&gt;&lt;?php echo esc_html($wp_rewrite-&gt;iis7_url_rewrite_rules(true)); ?&gt;&lt;/textarea&gt;&lt;/p&gt;
</span><span class="cx"> &lt;/form&gt;
</span><del>-&lt;p&gt;&lt;?php _e('If you temporarily make your site&amp;#8217;s root directory writable for us to generate the &lt;code&gt;web.config&lt;/code&gt; file automatically, do not forget to revert the permissions after the file has been created.')  ?&gt;&lt;/p&gt;                        
</del><ins>+&lt;p&gt;&lt;?php _e('If you temporarily make your site&amp;#8217;s root directory writable for us to generate the &lt;code&gt;web.config&lt;/code&gt; file automatically, do not forget to revert the permissions after the file has been created.')  ?&gt;&lt;/p&gt;
</ins><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx">         &lt;?php endif; ?&gt;
</span><span class="cx"> &lt;?php else :
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/options.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( 'options' == $option_page ) {
</span><span class="cx">                 $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
</span><del>-                if ( !is_super_admin() ) 
</del><ins>+                if ( !is_super_admin() )
</ins><span class="cx">                         wp_die( __( 'Not allowed here' ) );
</span><span class="cx">         } else {
</span><span class="cx">                 $options = $whitelist_options[ $option_page ];
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/press-this.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">         $quick['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
</span><span class="cx">         $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
</span><span class="cx">         $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : '  ';
</span><del>-        $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 
</del><ins>+        $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
</ins><span class="cx"> 
</span><span class="cx">         // insert the post with nothing in it, to get an ID
</span><span class="cx">         $post_ID = wp_insert_post($quick, true);
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx">                                         jQuery('#extra-fields').show();
</span><span class="cx">                                 }
</span><span class="cx">                                 jQuery('#extra-fields').before('&lt;div id=&quot;waiting&quot;&gt;&lt;img src=&quot;images/wpspin_light.gif&quot; alt=&quot;&quot; /&gt; &lt;?php echo esc_js( __( 'Loading...' ) ); ?&gt;&lt;/div&gt;');
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 if(photostorage == false) {
</span><span class="cx">                                         jQuery.ajax({
</span><span class="cx">                                                 type: &quot;GET&quot;,
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/theme-editor.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> } else {
</span><span class="cx">         $file = stripslashes($file);
</span><span class="cx">         if ( 'theme' == $dir ) {
</span><del>-                $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 
</del><ins>+                $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ;
</ins><span class="cx">         } else if ( 'style' == $dir) {
</span><del>-                $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ; 
</del><ins>+                $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ;
</ins><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/themes.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx">         $themes = get_themes();
</span><span class="cx">         $ct = current_theme_info();
</span><del>-        $allowed_themes = apply_filters(&quot;allowed_themes&quot;, get_site_allowed_themes() ); 
</del><ins>+        $allowed_themes = apply_filters(&quot;allowed_themes&quot;, get_site_allowed_themes() );
</ins><span class="cx">         if( $allowed_themes == false )
</span><span class="cx">                 $allowed_themes = array();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-admin/user-edit.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -61,10 +61,10 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-// Only allow site admins to edit every user. 
-if ( is_multisite() &amp;&amp; !defined( &quot;EDIT_ANY_USER&quot; ) &amp;&amp; !is_super_admin() &amp;&amp; $user_id != $current_user-&gt;ID ) 
-        wp_die( __( 'You do not have permission to edit this user.' ) ); 
-        
</del><ins>+// Only allow site admins to edit every user.
+if ( is_multisite() &amp;&amp; !defined( &quot;EDIT_ANY_USER&quot; ) &amp;&amp; !is_super_admin() &amp;&amp; $user_id != $current_user-&gt;ID )
+        wp_die( __( 'You do not have permission to edit this user.' ) );
+
</ins><span class="cx"> switch ($action) {
</span><span class="cx"> case 'switchposts':
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpconfigsamplephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-config-sample.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-config-sample.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-config-sample.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> &lt;?php
</span><del>-/** 
</del><ins>+/**
</ins><span class="cx">  * The base configurations of the WordPress.
</span><span class="cx">  *
</span><span class="cx">  * This file has the following configurations: MySQL settings, Table Prefix,
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/capabilities.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">          *
</span><span class="cx">          * The capabilities are defined in the following format `array( 'read' =&gt; true );`
</span><span class="cx">          * To explicitly deny a role a capability you set the value for that capability to false.
</span><del>-         * 
</del><ins>+         *
</ins><span class="cx">          * @since 2.0.0
</span><span class="cx">          * @access public
</span><span class="cx">          *
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx">                         _deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') );
</span><span class="cx">                         $cap = $this-&gt;translate_level_to_cap( $cap );
</span><span class="cx">                 }
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $args = array_slice( func_get_args(), 1 );
</span><span class="cx">                 $args = array_merge( array( $cap, $this-&gt;ID ), $args );
</span><span class="cx">                 $caps = call_user_func_array( 'map_meta_cap', $args );
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/comment.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -189,14 +189,14 @@
</span><span class="cx">                 'author_email' =&gt; '',
</span><span class="cx">                 'ID' =&gt; '',
</span><span class="cx">                 'karma' =&gt; '',
</span><del>-                'number' =&gt; '', 
-                'offset' =&gt; '', 
-                'orderby' =&gt; '', 
-                'order' =&gt; 'DESC', 
</del><ins>+                'number' =&gt; '',
+                'offset' =&gt; '',
+                'orderby' =&gt; '',
+                'order' =&gt; 'DESC',
</ins><span class="cx">                 'parent' =&gt; '',
</span><span class="cx">                 'post_ID' =&gt; '',
</span><span class="cx">                 'post_id' =&gt; 0,
</span><del>-                'status' =&gt; '', 
</del><ins>+                'status' =&gt; '',
</ins><span class="cx">                 'type' =&gt; '',
</span><span class="cx">                 'user_id' =&gt; '',
</span><span class="cx">         );
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">         if ( ! empty( $orderby ) ) {
</span><span class="cx">                 $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
</span><span class="cx">                 $ordersby = array_intersect(
</span><del>-                        $ordersby, 
</del><ins>+                        $ordersby,
</ins><span class="cx">                         array(
</span><span class="cx">                                 'comment_agent',
</span><span class="cx">                                 'comment_approved',
</span><span class="lines">@@ -276,13 +276,13 @@
</span><span class="cx"> 
</span><span class="cx">         if ( ! empty($post_id) )
</span><span class="cx">                 $post_where .= $wpdb-&gt;prepare( 'comment_post_ID = %d AND ', $post_id );
</span><del>-        if ( '' !== $author_email ) 
</del><ins>+        if ( '' !== $author_email )
</ins><span class="cx">                 $post_where .= $wpdb-&gt;prepare( 'comment_author_email = %s AND ', $author_email );
</span><span class="cx">         if ( '' !== $karma )
</span><span class="cx">                 $post_where .= $wpdb-&gt;prepare( 'comment_karma = %d AND ', $karma );
</span><span class="cx">         if ( 'comment' == $type )
</span><span class="cx">                 $post_where .= &quot;comment_type = '' AND &quot;;
</span><del>-        elseif ( ! empty( $type ) ) 
</del><ins>+        elseif ( ! empty( $type ) )
</ins><span class="cx">                 $post_where .= $wpdb-&gt;prepare( 'comment_type = %s AND ', $type );
</span><span class="cx">         if ( '' !== $parent )
</span><span class="cx">                 $post_where .= $wpdb-&gt;prepare( 'comment_parent = %d AND ', $parent );
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/default-constants.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">                                         define('WP_MEMORY_LIMIT', '32M');
</span><span class="cx">                                 }
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * The $blog_id global, which you can change in the config allows you to create a simple
</span><span class="cx">                          * multiple blog installation using just one WordPress and changing $blog_id around.
</span><span class="lines">@@ -36,35 +36,35 @@
</span><span class="cx">                          */
</span><span class="cx">                         if ( ! isset($blog_id) )
</span><span class="cx">                                 $blog_id = 1;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // set memory limits.
</span><span class="cx">                         if ( function_exists('memory_get_usage') &amp;&amp; ( (int) @ini_get('memory_limit') &lt; abs(intval(WP_MEMORY_LIMIT)) ) )
</span><span class="cx">                                 @ini_set('memory_limit', WP_MEMORY_LIMIT);
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if ( !defined('WP_CONTENT_DIR') )
</span><span class="cx">                                 define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
</span><span class="cx">                         if ( !defined('WP_DEBUG') )
</span><span class="cx">                                 define( 'WP_DEBUG', false );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On
</span><span class="cx">                         if ( !defined('WP_DEBUG_DISPLAY') )
</span><span class="cx">                                 define( 'WP_DEBUG_DISPLAY', true );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Add define('WP_DEBUG_LOG', true); to enable php debug logging to WP_CONTENT_DIR/debug.log
</span><span class="cx">                         if ( !defined('WP_DEBUG_LOG') )
</span><span class="cx">                                 define('WP_DEBUG_LOG', false);
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if ( !defined('WP_CACHE') )
</span><span class="cx">                                 define('WP_CACHE', false);
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Private
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('MEDIA_TRASH') )
</span><span class="cx">                                 define('MEDIA_TRASH', false);
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if ( !defined('SHORTINIT') )
</span><span class="cx">                                 define('SHORTINIT', false);
</span><span class="cx">                         break;
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> 
</span><span class="cx">                         if ( !defined('WP_CONTENT_URL') )
</span><span class="cx">                                 define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Allows for the plugins directory to be moved from the default location.
</span><span class="cx">                          *
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('WP_PLUGIN_DIR') )
</span><span class="cx">                                 define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Allows for the plugins directory to be moved from the default location.
</span><span class="cx">                          *
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('WP_PLUGIN_URL') )
</span><span class="cx">                                 define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Allows for the plugins directory to be moved from the default location.
</span><span class="cx">                          *
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('WPMU_PLUGIN_DIR') )
</span><span class="cx">                                 define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Allows for the mu-plugins directory to be moved from the default location.
</span><span class="cx">                          *
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('WPMU_PLUGIN_URL') )
</span><span class="cx">                                 define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Allows for the mu-plugins directory to be moved from the default location.
</span><span class="cx">                          *
</span><span class="lines">@@ -129,97 +129,97 @@
</span><span class="cx">                 case 'ms_loaded';
</span><span class="cx"> 
</span><span class="cx">                         global $wp_default_secret_key;
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Used to guarantee unique hash cookies
</span><span class="cx">                          * @since 1.5
</span><span class="cx">                          */
</span><span class="cx">                         if( !defined('COOKIEHASH') )
</span><span class="cx">                                         define('COOKIEHASH', md5(get_option('siteurl')));
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
</span><span class="cx">                          * @since 2.5.0
</span><span class="cx">                          */
</span><span class="cx">                         $wp_default_secret_key = 'put your unique phrase here';
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.0.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('USER_COOKIE') )
</span><span class="cx">                                 define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.0.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('PASS_COOKIE') )
</span><span class="cx">                                 define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.5.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('AUTH_COOKIE') )
</span><span class="cx">                                 define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('SECURE_AUTH_COOKIE') )
</span><span class="cx">                                 define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('LOGGED_IN_COOKIE') )
</span><span class="cx">                                 define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.3.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('TEST_COOKIE') )
</span><span class="cx">                                 define('TEST_COOKIE', 'wordpress_test_cookie');
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 1.2.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('COOKIEPATH') )
</span><span class="cx">                                 define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 1.5.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('SITECOOKIEPATH') )
</span><span class="cx">                                 define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('ADMIN_COOKIE_PATH') )
</span><span class="cx">                                 define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('PLUGINS_COOKIE_PATH') )
</span><span class="cx">                                 define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.0.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined('COOKIE_DOMAIN') )
</span><span class="cx">                                 define('COOKIE_DOMAIN', false);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">                         if ( !defined('FORCE_SSL_ADMIN') )
</span><span class="cx">                                 define('FORCE_SSL_ADMIN', false);
</span><span class="cx">                         force_ssl_admin(FORCE_SSL_ADMIN);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.6.0
</span><span class="lines">@@ -235,14 +235,14 @@
</span><span class="cx">                         if ( !defined('FORCE_SSL_LOGIN') )
</span><span class="cx">                                 define('FORCE_SSL_LOGIN', false);
</span><span class="cx">                         force_ssl_login(FORCE_SSL_LOGIN);
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.5.0
</span><span class="cx">                          */
</span><span class="cx">                         if ( !defined( 'AUTOSAVE_INTERVAL' ) )
</span><span class="cx">                                 define( 'AUTOSAVE_INTERVAL', 60 );
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * It is possible to define this in wp-config.php
</span><span class="cx">                          * @since 2.9.0
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx">                          * @since 1.5.0
</span><span class="cx">                          */
</span><span class="cx">                         define('TEMPLATEPATH', get_template_directory());
</span><del>-                
</del><ins>+
</ins><span class="cx">                         /**
</span><span class="cx">                          * Web Path to the current active template stylesheet directory
</span><span class="cx">                          * @since 2.1.0
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/default-widgets.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -790,7 +790,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( !$rss-&gt;get_item_quantity() ) {
</span><span class="cx">                 echo '&lt;ul&gt;&lt;li&gt;' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '&lt;/li&gt;&lt;/ul&gt;';
</span><del>-                $rss-&gt;__destruct(); 
</del><ins>+                $rss-&gt;__destruct();
</ins><span class="cx">                 unset($rss);
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx">                 }
</span><span class="cx">         }
</span><span class="cx">         echo '&lt;/ul&gt;';
</span><del>-        $rss-&gt;__destruct(); 
</del><ins>+        $rss-&gt;__destruct();
</ins><span class="cx">         unset($rss);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/deprecated.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx">                 'show_description' =&gt; 1,
</span><span class="cx">                 'title_li' =&gt; '',
</span><span class="cx">         );
</span><del>-        
</del><ins>+
</ins><span class="cx">         $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> 
</span><span class="cx">         return wp_list_bookmarks($r);
</span><span class="lines">@@ -973,23 +973,23 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $defaults = array(
</span><del>-                'after' =&gt; '&lt;br /&gt;', 
</del><ins>+                'after' =&gt; '&lt;br /&gt;',
</ins><span class="cx">                 'before' =&gt; '',
</span><span class="cx">                 'between' =&gt; ' ',
</span><span class="cx">                 'categorize' =&gt; 0,
</span><del>-                'category' =&gt; '', 
</del><ins>+                'category' =&gt; '',
</ins><span class="cx">                 'echo' =&gt; true,
</span><del>-                'limit' =&gt; -1, 
</del><ins>+                'limit' =&gt; -1,
</ins><span class="cx">                 'orderby' =&gt; 'name',
</span><del>-                'show_description' =&gt; true, 
-                'show_images' =&gt; true, 
</del><ins>+                'show_description' =&gt; true,
+                'show_images' =&gt; true,
</ins><span class="cx">                 'show_rating' =&gt; false,
</span><span class="cx">                 'show_updated' =&gt; true,
</span><span class="cx">                 'title_li' =&gt; '',
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         $r = wp_parse_args( $args, $defaults );
</span><del>-        
</del><ins>+
</ins><span class="cx">         return wp_list_bookmarks($r);
</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 (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/formatting.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">         $curl = '';
</span><span class="cx">         $textarr = preg_split('/(&lt;.*&gt;|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
</span><span class="cx">         $stop = count($textarr);
</span><del>-        
</del><ins>+
</ins><span class="cx">         // No need to setup these variables more than once
</span><span class="cx">         if (!$static_setup) {
</span><span class="cx">                 /* translators: opening curly quote */
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">                 $curl = $textarr[$i];
</span><span class="cx"> 
</span><span class="cx">                 if ( !empty($curl) &amp;&amp; '&lt;' != $curl{0} &amp;&amp; '[' != $curl{0}
</span><del>-                                &amp;&amp; empty($no_texturize_shortcodes_stack) &amp;&amp; empty($no_texturize_tags_stack)) { 
</del><ins>+                                &amp;&amp; empty($no_texturize_shortcodes_stack) &amp;&amp; empty($no_texturize_tags_stack)) {
</ins><span class="cx">                         // This is not a tag, nor is the texturization disabled
</span><span class="cx">                         // static strings
</span><span class="cx">                         $curl = str_replace($static_characters, $static_replacements, $curl);
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">                         /*
</span><span class="cx">                          * This disables texturize until we find a closing tag of our type
</span><span class="cx">                          * (e.g. &lt;pre&gt;) even if there was invalid nesting before that
</span><del>-                         * 
</del><ins>+                         *
</ins><span class="cx">                          * Example: in the case &lt;pre&gt;sadsadasd&lt;/code&gt;&quot;baba&quot;&lt;/pre&gt;
</span><span class="cx">                          *          &quot;baba&quot; won't be texturize
</span><span class="cx">                          */
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx">         // long alpha string not in the extension whitelist.
</span><span class="cx">         foreach ( (array) $parts as $part) {
</span><span class="cx">                 $filename .= '.' . $part;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 if ( preg_match(&quot;/^[a-zA-Z]{2,5}\d?$/&quot;, $part) ) {
</span><span class="cx">                         $allowed = false;
</span><span class="cx">                         foreach ( $mimes as $ext_preg =&gt; $mime_match ) {
</span><span class="lines">@@ -2413,7 +2413,7 @@
</span><span class="cx">  * @return string text, safe for inclusion in LIKE query.
</span><span class="cx">  */
</span><span class="cx"> function like_escape($text) {
</span><del>-        return addcslashes($text, '\\%_'); 
</del><ins>+        return addcslashes($text, '\\%_');
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/functions.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx"> 
</span><span class="cx">         do_action( &quot;add_option_{$name}&quot;, $name, $value );
</span><span class="cx">         do_action( 'added_option', $name, $value );
</span><del>-        
</del><ins>+
</ins><span class="cx">         return;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2307,8 +2307,8 @@
</span><span class="cx">                 'ogg' =&gt; 'audio/ogg',
</span><span class="cx">                 'mid|midi' =&gt; 'audio/midi',
</span><span class="cx">                 'wma' =&gt; 'audio/wma',
</span><del>-                'mka' =&gt; 'audio/x-matroska', 
-                'mkv' =&gt; 'video/x-matroska', 
</del><ins>+                'mka' =&gt; 'audio/x-matroska',
+                'mkv' =&gt; 'video/x-matroska',
</ins><span class="cx">                 'rtf' =&gt; 'application/rtf',
</span><span class="cx">                 'js' =&gt; 'application/javascript',
</span><span class="cx">                 'pdf' =&gt; 'application/pdf',
</span><span class="lines">@@ -3392,7 +3392,7 @@
</span><span class="cx">  *
</span><span class="cx">  * If the transient does not exist or does not have a value, then the return value
</span><span class="cx">  * will be false.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  * @package WordPress
</span><span class="cx">  * @subpackage Transient
</span><span class="lines">@@ -3678,7 +3678,7 @@
</span><span class="cx">                 if ( $offset_value === $selected_zone )
</span><span class="cx">                         $selected = 'selected=&quot;selected&quot; ';
</span><span class="cx">                 $structure[] = '&lt;option ' . $selected . 'value=&quot;' . esc_attr( $offset_value ) . '&quot;&gt;' . esc_html( $offset_name ) . &quot;&lt;/option&gt;&quot;;
</span><del>-                
</del><ins>+
</ins><span class="cx">         }
</span><span class="cx">         $structure[] = '&lt;/optgroup&gt;';
</span><span class="cx"> 
</span><span class="lines">@@ -3745,7 +3745,7 @@
</span><span class="cx"> /**
</span><span class="cx">  * Parse the file contents to retrieve its metadata.
</span><span class="cx">  *
</span><del>- * Searches for metadata for a file, such as a plugin or theme.  Each piece of 
</del><ins>+ * Searches for metadata for a file, such as a plugin or theme.  Each piece of
</ins><span class="cx">  * metadata must be on its own line. For a field spanning multple lines, it
</span><span class="cx">  * must not have any newlines or only parts of it will be displayed.
</span><span class="cx">  *
</span><span class="lines">@@ -3765,7 +3765,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @param string $file Path to the file
</span><span class="cx">  * @param bool $markup If the returned data should have HTML markup applied
</span><del>- * @param string $context If specified adds filter hook &quot;extra_&lt;$context&gt;_headers&quot; 
</del><ins>+ * @param string $context If specified adds filter hook &quot;extra_&lt;$context&gt;_headers&quot;
</ins><span class="cx">  */
</span><span class="cx"> function get_file_data( $file, $default_headers, $context = '' ) {
</span><span class="cx">         // We don't need to write to the file, so just open for reading.
</span><span class="lines">@@ -3789,7 +3789,7 @@
</span><span class="cx">                 $all_headers = $default_headers;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        
</del><ins>+
</ins><span class="cx">         foreach ( $all_headers as $field =&gt; $regex ) {
</span><span class="cx">                 preg_match( '/' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field});
</span><span class="cx">                 if ( !empty( ${$field} ) )
</span><span class="lines">@@ -3799,12 +3799,12 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $file_data = compact( array_keys( $all_headers ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         return $file_data;
</span><span class="cx"> }
</span><span class="cx"> /*
</span><span class="cx">  * Used internally to tidy up the search terms
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @private
</span><span class="cx">  * @since 2.9.0
</span><span class="cx">  */
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/general-template.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -210,18 +210,18 @@
</span><span class="cx">                                                  'form_id' =&gt; 'loginform',
</span><span class="cx">                                                 'label_username' =&gt; __( 'Username' ),
</span><span class="cx">                                                 'label_password' =&gt; __( 'Password' ),
</span><del>-                                                'label_remember' =&gt; __( 'Remember Me' ), 
-                                                'label_log_in' =&gt; __( 'Log In' ), 
-                                                'id_username' =&gt; 'user_login',  
-                                                'id_password' =&gt; 'user_pass', 
-                                                'id_remember' =&gt; 'rememberme', 
-                                                'id_submit' =&gt; 'wp-submit', 
-                                                'remember' =&gt; true, 
</del><ins>+                                                'label_remember' =&gt; __( 'Remember Me' ),
+                                                'label_log_in' =&gt; __( 'Log In' ),
+                                                'id_username' =&gt; 'user_login',
+                                                'id_password' =&gt; 'user_pass',
+                                                'id_remember' =&gt; 'rememberme',
+                                                'id_submit' =&gt; 'wp-submit',
+                                                'remember' =&gt; true,
</ins><span class="cx">                                                 'value_username' =&gt; '',
</span><span class="cx">                                                 'value_remember' =&gt; false, // Set this to true to default the &quot;Remember me&quot; checkbox to checked
</span><span class="cx">                                         );
</span><span class="cx">         $args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         $form = '
</span><span class="cx">                 &lt;form name=&quot;' . $args['form_id'] . '&quot; id=&quot;' . $args['form_id'] . '&quot; action=&quot;' . site_url( 'wp-login.php', 'login' ) . '&quot; method=&quot;post&quot;&gt;
</span><span class="cx">                         ' . do_action( 'login_form_top' ) . '
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">                         &lt;/p&gt;
</span><span class="cx">                         ' . do_action( 'login_form_bottom' ) . '
</span><span class="cx">                 &lt;/form&gt;';
</span><del>-                
</del><ins>+
</ins><span class="cx">         if ( $args['echo'] )
</span><span class="cx">                 echo $form;
</span><span class="cx">         else
</span><span class="lines">@@ -1301,15 +1301,15 @@
</span><span class="cx">  * @return string|null Null if displaying, string if retrieving.
</span><span class="cx">  */
</span><span class="cx"> function the_modified_date($d = '', $before='', $after='', $echo = true) {
</span><del>-        
</del><ins>+
</ins><span class="cx">         $the_modified_date = $before . get_the_modified_date($d) . $after;
</span><span class="cx">         $the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( $echo )
</span><span class="cx">                 echo $the_modified_date;
</span><span class="cx">         else
</span><span class="cx">                 return $the_modified_date;
</span><del>-        
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesjsautosavedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.dev.js (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.dev.js        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/js/autosave.dev.js        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> 
</span><span class="cx"> jQuery(document).ready( function($) {
</span><span class="cx">         var dotabkey = true;
</span><del>-        
</del><ins>+
</ins><span class="cx">         autosaveLast = $('#post #title').val() + $('#post #content').val();
</span><span class="cx">         autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true});
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesjsquicktagsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.dev.js (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/quicktags.dev.js        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/js/quicktags.dev.js        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> 
</span><span class="cx"> function edInsertContent(myField, myValue) {
</span><span class="cx">         var sel, startPos, endPos, scrollTop;
</span><del>-        
</del><ins>+
</ins><span class="cx">         //IE support
</span><span class="cx">         if (document.selection) {
</span><span class="cx">                 myField.focus();
</span></span></pre></div>
<a id="trunkwpincludesjswplistrevisionsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-list-revisions.dev.js (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-list-revisions.dev.js        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/js/wp-list-revisions.dev.js        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -7,17 +7,17 @@
</span><span class="cx">                         for ( i = 0; i &lt; inputs.length; i++ ) {
</span><span class="cx">                                 checkCount += inputs[i].checked ? 1 : 0;
</span><span class="cx">                                 side = inputs[i].getAttribute('name');
</span><del>-                                if ( ! inputs[i].checked &amp;&amp; 
</del><ins>+                                if ( ! inputs[i].checked &amp;&amp;
</ins><span class="cx">                                 ( 'left' == side &amp;&amp; 1 &gt; checkCount || 'right' == side &amp;&amp; 1 &lt; checkCount &amp;&amp; ( ! inputs[i-1] || ! inputs[i-1].checked ) ) &amp;&amp;
</span><span class="cx">                                 ! ( inputs[i+1] &amp;&amp; inputs[i+1].checked &amp;&amp; 'right' == inputs[i+1].getAttribute('name') ) )
</span><del>-                                        inputs[i].style.visibility = 'hidden';                
</del><ins>+                                        inputs[i].style.visibility = 'hidden';
</ins><span class="cx">                                 else if ( 'left' == side || 'right' == side )
</span><span class="cx">                                         inputs[i].style.visibility = 'visible';
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">                 pr.onclick();
</span><span class="cx">         }
</span><del>-        if ( w &amp;&amp; w.addEventListener ) 
</del><ins>+        if ( w &amp;&amp; w.addEventListener )
</ins><span class="cx">                 w.addEventListener('load', init, false);
</span><span class="cx">         else if ( w &amp;&amp; w.attachEvent )
</span><span class="cx">                 w.attachEvent('onload', init);
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/l10n.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -313,15 +313,15 @@
</span><span class="cx">  */
</span><span class="cx"> function load_textdomain( $domain, $mofile ) {
</span><span class="cx">         global $l10n;
</span><del>-        
</del><ins>+
</ins><span class="cx">         $plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( true == $plugin_override ) {
</span><span class="cx">                 return true;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         do_action( 'load_textdomain', $domain, $mofile );
</span><del>-                
</del><ins>+
</ins><span class="cx">         $mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
</span><span class="cx"> 
</span><span class="cx">         if ( !is_readable( $mofile ) ) return false;
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">                 $mo-&gt;merge_with( $l10n[$domain] );
</span><span class="cx"> 
</span><span class="cx">         $l10n[$domain] = &amp;$mo;
</span><del>-        
</del><ins>+
</ins><span class="cx">         return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx">         } else {
</span><span class="cx">                 $path = WP_PLUGIN_DIR;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
</span><span class="cx">         return load_textdomain( $domain, $mofile );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/link-template.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx">         else
</span><span class="cx">                 $action = '&amp;action=edit';
</span><span class="cx"> 
</span><del>-        $post_type_object = get_post_type_object( $post-&gt;post_type ); 
</del><ins>+        $post_type_object = get_post_type_object( $post-&gt;post_type );
</ins><span class="cx">         if ( !$post_type_object )
</span><span class="cx">                 return;
</span><span class="cx"> 
</span><span class="lines">@@ -1098,7 +1098,7 @@
</span><span class="cx">         // If there is no post stop.
</span><span class="cx">         if ( empty($posts) )
</span><span class="cx">                 return;
</span><del>-        
</del><ins>+
</ins><span class="cx">         // Even though we limited get_posts to return only 1 item it still returns an array of objects.
</span><span class="cx">         $post = $posts[0];
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/media.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -745,8 +745,8 @@
</span><span class="cx">         $captiontag = tag_escape($captiontag);
</span><span class="cx">         $columns = intval($columns);
</span><span class="cx">         $itemwidth = $columns &gt; 0 ? floor(100/$columns) : 100;
</span><del>-        $float = $wp_locale-&gt;text_direction == 'rtl' ? 'right' : 'left'; 
-        
</del><ins>+        $float = $wp_locale-&gt;text_direction == 'rtl' ? 'right' : 'left';
+
</ins><span class="cx">         $selector = &quot;gallery-{$instance}&quot;;
</span><span class="cx"> 
</span><span class="cx">         $output = apply_filters('gallery_style', &quot;
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/ms-deprecated.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> /*
</span><span class="cx">  * Deprecated functions come here to die.
</span><span class="cx">  */
</span><del>- 
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx">  * @since unknown
</span><span class="cx">  * @deprecated 3.0
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/ms-functions.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -1373,7 +1373,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( $wpdb-&gt;get_results(&quot;SELECT ID FROM $wpdb-&gt;posts&quot;) )
</span><span class="cx">                 die(__('&lt;h1&gt;Already Installed&lt;/h1&gt;&lt;p&gt;You appear to have already installed WordPress. To reinstall please clear your old database tables first.&lt;/p&gt;') . '&lt;/body&gt;&lt;/html&gt;');
</span><del>-                
</del><ins>+
</ins><span class="cx">         $wpdb-&gt;suppress_errors(false);
</span><span class="cx"> 
</span><span class="cx">         $url = get_blogaddress_by_id($blog_id);
</span><span class="lines">@@ -1402,7 +1402,7 @@
</span><span class="cx">         $cat_slug = sanitize_title($cat_name);
</span><span class="cx"> 
</span><span class="cx">         $blogroll_id = $wpdb-&gt;get_var( $wpdb-&gt;prepare( &quot;SELECT cat_ID FROM {$wpdb-&gt;sitecategories} WHERE category_nicename = %s&quot;, $cat_slug ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( $blogroll_id == null ) {
</span><span class="cx">                 $wpdb-&gt;insert( $wpdb-&gt;sitecategories, array('cat_ID' =&gt; 0, 'cat_name' =&gt; $cat_name, 'category_nicename' =&gt; $cat_slug, 'last_updated' =&gt; current_time('mysql', true)) );
</span><span class="cx">                 $blogroll_id = $wpdb-&gt;insert_id;
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/pluggable.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx">         if ('' == $user-&gt;user_email) return false; // If there's no email to send the comment to
</span><span class="cx"> 
</span><span class="cx">         $comment_author_domain = @gethostbyaddr($comment-&gt;comment_author_IP);
</span><del>-        
</del><ins>+
</ins><span class="cx">         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
</span><span class="cx">         // we want to reverse this for the plain text arena of emails.
</span><span class="cx">         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><span class="lines">@@ -1072,11 +1072,11 @@
</span><span class="cx"> 
</span><span class="cx">         $comment_author_domain = @gethostbyaddr($comment-&gt;comment_author_IP);
</span><span class="cx">         $comments_waiting = $wpdb-&gt;get_var(&quot;SELECT count(comment_ID) FROM $wpdb-&gt;comments WHERE comment_approved = '0'&quot;);
</span><del>-        
</del><ins>+
</ins><span class="cx">         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
</span><span class="cx">         // we want to reverse this for the plain text arena of emails.
</span><span class="cx">         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><del>-        
</del><ins>+
</ins><span class="cx">         switch ($comment-&gt;comment_type)
</span><span class="cx">         {
</span><span class="cx">                 case 'trackback':
</span><span class="lines">@@ -1164,7 +1164,7 @@
</span><span class="cx"> 
</span><span class="cx">         $user_login = stripslashes($user-&gt;user_login);
</span><span class="cx">         $user_email = stripslashes($user-&gt;user_email);
</span><del>-        
</del><ins>+
</ins><span class="cx">         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
</span><span class="cx">         // we want to reverse this for the plain text arena of emails.
</span><span class="cx">         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/plugin.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( ! isset($wp_actions) )
</span><span class="cx">                 $wp_actions = array();
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( ! isset($wp_actions[$tag]) )
</span><span class="cx">                 $wp_actions[$tag] = 1;
</span><span class="cx">         else
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( ! isset($wp_actions) )
</span><span class="cx">                 $wp_actions = array();
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( ! isset($wp_actions[$tag]) )
</span><span class="cx">                 $wp_actions[$tag] = 1;
</span><span class="cx">         else
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-thumbnail-template.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-thumbnail-template.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/post-thumbnail-template.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Check if post has an image attached.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $post_id Optional. Post ID.
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Retrieve Post Thumbnail ID.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $post_id Optional. Post ID.
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Display Post Thumbnail.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $size Optional. Image size.  Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );.
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Retrieve Post Thumbnail.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 2.9.0
</span><span class="cx">  *
</span><span class="cx">  * @param int $post_id Optional. Post ID.
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/post.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Register support of certain features for a post type.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @since 3.0
</span><span class="cx">  * @param string $post_type The post type for which to add the feature
</span><span class="cx">  * @param string|array $feature the feature being added, can be an array of feature strings or a single string
</span><span class="lines">@@ -2151,8 +2151,8 @@
</span><span class="cx"> /**
</span><span class="cx">  * Given the desired slug and some post details computes a unique slug for the post.
</span><span class="cx">  *
</span><del>- * @global wpdb $wpdb 
- * @global WP_Rewrite $wp_rewrite 
</del><ins>+ * @global wpdb $wpdb
+ * @global WP_Rewrite $wp_rewrite
</ins><span class="cx">  * @param string $slug the desired slug (post_name)
</span><span class="cx">  * @param integer $post_ID
</span><span class="cx">  * @param string $post_status no uniqueness checks are made if the post is still draft or pending
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/query.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -332,10 +332,10 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Whether current page view is the blog homepage.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * This is the page which is showing the time based blog content of your site
</span><span class="cx">  * so if you set a static page for the front page of your site then this will
</span><del>- * only be true on the page which you set as the &quot;Posts page&quot; in Reading Settings. 
</del><ins>+ * only be true on the page which you set as the &quot;Posts page&quot; in Reading Settings.
</ins><span class="cx">  *
</span><span class="cx">  * @since 1.5.0
</span><span class="cx">  * @uses $wp_query
</span><span class="lines">@@ -2065,7 +2065,7 @@
</span><span class="cx">                 else {
</span><span class="cx">                         $post_type_object = get_post_type_object ( $post_type );
</span><span class="cx">                         if ( !empty($post_type_object) )
</span><del>-                                $post_type_cap = $post_type_object-&gt;capability_type; 
</del><ins>+                                $post_type_cap = $post_type_object-&gt;capability_type;
</ins><span class="cx">                         else
</span><span class="cx">                                 $post_type_cap = $post_type;
</span><span class="cx">                 }
</span><span class="lines">@@ -2077,7 +2077,7 @@
</span><span class="cx">                 if ( 'any' == $post_type ) {
</span><span class="cx">                         $where .= $exclude_post_types;
</span><span class="cx">                 } elseif ( !empty( $post_type ) &amp;&amp; is_array( $post_type ) ) {
</span><del>-                        $where .= &quot; AND $wpdb-&gt;posts.post_type IN ('&quot; . join(&quot;', '&quot;, $post_type) . &quot;')&quot;; 
</del><ins>+                        $where .= &quot; AND $wpdb-&gt;posts.post_type IN ('&quot; . join(&quot;', '&quot;, $post_type) . &quot;')&quot;;
</ins><span class="cx">                 } elseif ( ! empty( $post_type ) ) {
</span><span class="cx">                         $where .= &quot; AND $wpdb-&gt;posts.post_type = '$post_type'&quot;;
</span><span class="cx">                 } elseif ( $this-&gt;is_attachment ) {
</span></span></pre></div>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/registration.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -118,14 +118,14 @@
</span><span class="cx"> 
</span><span class="cx">         $user_login = sanitize_user($user_login, true);
</span><span class="cx">         $user_login = apply_filters('pre_user_login', $user_login);
</span><del>-        
</del><ins>+
</ins><span class="cx">         //Remove any non-printable chars from the login string to see if we have ended up with an empty username
</span><span class="cx">         $user_login = trim($user_login);
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( empty($user_login) ) {
</span><span class="cx">                 return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( empty($user_nicename) )
</span><span class="cx">                 $user_nicename = sanitize_title( $user_login );
</span><span class="cx">         $user_nicename = apply_filters('pre_user_nicename', $user_nicename);
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/rewrite.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> 
</span><span class="cx">                 //get pages in order of hierarchy, i.e. children after parents
</span><span class="cx">                 $posts = get_page_hierarchy($wpdb-&gt;get_results(&quot;SELECT ID, post_name, post_parent FROM $wpdb-&gt;posts WHERE post_type = 'page'&quot;));
</span><del>-                
</del><ins>+
</ins><span class="cx">                 // If we have no pages get out quick
</span><span class="cx">                 if ( !$posts )
</span><span class="cx">                         return array( array(), array() );
</span><span class="lines">@@ -1735,7 +1735,7 @@
</span><span class="cx">                                 $rules .= $indent.$indent.$indent.&quot;&lt;rules&gt;&quot;.$end_of_line;
</span><span class="cx">                                 $extra_indent = $indent.$indent.$indent.$indent;
</span><span class="cx">                         }
</span><del>-        
</del><ins>+
</ins><span class="cx">                         $rules .= $extra_indent.&quot;&lt;rule name=\&quot;wordpress\&quot; patternSyntax=\&quot;Wildcard\&quot;&gt;&quot;.$end_of_line;
</span><span class="cx">                         $rules .= $extra_indent.$indent.&quot;&lt;match url=\&quot;*\&quot; /&gt;&quot;.$end_of_line;
</span><span class="cx">                         $rules .= $extra_indent.$indent.$indent.&quot;&lt;conditions&gt;&quot;.$end_of_line;
</span><span class="lines">@@ -1744,7 +1744,7 @@
</span><span class="cx">                         $rules .= $extra_indent.$indent.$indent.&quot;&lt;/conditions&gt;&quot;.$end_of_line;
</span><span class="cx">                         $rules .= $extra_indent.$indent.&quot;&lt;action type=\&quot;Rewrite\&quot; url=\&quot;index.php\&quot; /&gt;&quot;.$end_of_line;
</span><span class="cx">                         $rules .= $extra_indent.&quot;&lt;/rule&gt;&quot;;
</span><del>-        
</del><ins>+
</ins><span class="cx">                         if ( $add_parent_tags ) {
</span><span class="cx">                                 $rules .= $end_of_line.$indent.$indent.$indent.&quot;&lt;/rules&gt;&quot;.$end_of_line;
</span><span class="cx">                                 $rules .= $indent.$indent.&quot;&lt;/rewrite&gt;&quot;.$end_of_line;
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/script-loader.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -176,8 +176,8 @@
</span><span class="cx">                         'noiframes' =&gt; __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
</span><span class="cx">                         'l10n_print_after' =&gt; 'try{convertEntities(thickboxL10n);}catch(e){};'
</span><span class="cx">         ) );
</span><del>-        
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx">         $scripts-&gt;add( 'jcrop', &quot;/wp-includes/js/jcrop/jquery.Jcrop$suffix.js&quot;, array('jquery'), '0.9.8');
</span><span class="cx"> 
</span><span class="cx">         $scripts-&gt;add( 'swfobject', &quot;/wp-includes/js/swfobject.js&quot;, false, '2.2');
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/taxonomy.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -575,9 +575,9 @@
</span><span class="cx">  * of term ids to exclude from the return array.  If 'include' is non-empty,
</span><span class="cx">  * 'exclude' is ignored.
</span><span class="cx">  *
</span><del>- * exclude_tree - Default is an empty array.  An array, comma- or space-delimited 
- * string of term ids to exclude from the return array, along with all of their 
- * descendant terms according to the primary taxonomy.  If 'include' is non-empty, 
</del><ins>+ * exclude_tree - Default is an empty array.  An array, comma- or space-delimited
+ * string of term ids to exclude from the return array, along with all of their
+ * descendant terms according to the primary taxonomy.  If 'include' is non-empty,
</ins><span class="cx">  * 'exclude_tree' is ignored.
</span><span class="cx">  *
</span><span class="cx">  * include - Default is an empty array.  An array, comma- or space-delimited string
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/theme.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -170,15 +170,15 @@
</span><span class="cx">  * @return array Theme data.
</span><span class="cx">  */
</span><span class="cx"> function get_theme_data( $theme_file ) {
</span><del>-        $default_headers = array( 
-                'Name' =&gt; 'Theme Name', 
-                'URI' =&gt; 'Theme URI', 
-                'Description' =&gt; 'Description', 
-                'Author' =&gt; 'Author', 
</del><ins>+        $default_headers = array(
+                'Name' =&gt; 'Theme Name',
+                'URI' =&gt; 'Theme URI',
+                'Description' =&gt; 'Description',
+                'Author' =&gt; 'Author',
</ins><span class="cx">                 'AuthorURI' =&gt; 'Author URI',
</span><del>-                'Version' =&gt; 'Version', 
-                'Template' =&gt; 'Template', 
-                'Status' =&gt; 'Status', 
</del><ins>+                'Version' =&gt; 'Version',
+                'Template' =&gt; 'Template',
+                'Status' =&gt; 'Status',
</ins><span class="cx">                 'Tags' =&gt; 'Tags'
</span><span class="cx">                 );
</span><span class="cx"> 
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">                 //Make unique and remove duplicates when stylesheet and template are the same i.e. most themes
</span><span class="cx">                 $template_files = array_unique($template_files);
</span><span class="cx">                 $stylesheet_files = array_unique($stylesheet_files);
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 $template_dir = dirname($template_files[0]);
</span><span class="cx">                 $stylesheet_dir = dirname($stylesheet_files[0]);
</span><span class="cx"> 
</span><span class="lines">@@ -1313,7 +1313,7 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Allows a theme to register its support of a certain feature
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * Must be called in the themes functions.php file to work.
</span><span class="cx">  *
</span><span class="cx">  * @author Mark Jaquith
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/user.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx">                 else
</span><span class="cx">                         $vars = get_object_vars($user);
</span><span class="cx">                 foreach ( array_keys($vars) as $field ) {
</span><del>-                        if ( is_string($user-&gt;$field) || is_numeric($user-&gt;$field) ) 
</del><ins>+                        if ( is_string($user-&gt;$field) || is_numeric($user-&gt;$field) )
</ins><span class="cx">                                 $user-&gt;$field = sanitize_user_field($field, $user-&gt;$field, $user-&gt;ID, $context);
</span><span class="cx">                 }
</span><span class="cx">                 $user-&gt;filter = $context;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-includes/wp-db.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx">                 // Perform the query via std mysql_query function..
</span><span class="cx">                 if ( defined('SAVEQUERIES') &amp;&amp; SAVEQUERIES )
</span><span class="cx">                         $this-&gt;timer_start();
</span><del>-                
</del><ins>+
</ins><span class="cx">                 // use $this-&gt;dbh for read ops, and $this-&gt;dbhwrite for write ops
</span><span class="cx">                 // use $this-&gt;dbhglobal for gloal table ops
</span><span class="cx">                 unset( $dbh );
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (12732 => 12733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php        2010-01-15 22:03:41 UTC (rev 12732)
+++ trunk/wp-signup.php        2010-01-15 22:11:12 UTC (rev 12733)
</span><span class="lines">@@ -29,17 +29,17 @@
</span><span class="cx"> 
</span><span class="cx"> function wpmu_signup_stylesheet() {
</span><span class="cx">         ?&gt;
</span><del>-        &lt;style type=&quot;text/css&quot;&gt;        
</del><ins>+        &lt;style type=&quot;text/css&quot;&gt;
</ins><span class="cx">                 .mu_register { width: 90%; margin:0 auto; }
</span><span class="cx">                 .mu_register form { margin-top: 2em; }
</span><span class="cx">                 .mu_register .error { font-weight:700; padding:10px; color:#333333; background:#FFEBE8; border:1px solid #CC0000; }
</span><span class="cx">                 .mu_register input[type=&quot;submit&quot;],
</span><span class="cx">                         .mu_register #blog_title,
</span><del>-                        .mu_register #user_email, 
</del><ins>+                        .mu_register #user_email,
</ins><span class="cx">                         .mu_register #blogname,
</span><del>-                        .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }        
</del><ins>+                        .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
</ins><span class="cx">                 .mu_register .prefix_address,
</span><del>-                        .mu_register .suffix_address {font-size: 18px;display:inline; }                        
</del><ins>+                        .mu_register .suffix_address {font-size: 18px;display:inline; }
</ins><span class="cx">                 .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; }
</span><span class="cx">                 .mu_register label.checkbox { display:inline; }
</span><span class="cx">                 .mu_register .mu_alert { font-weight:700; padding:10px; color:#333333; background:#ffffe0; border:1px solid #e6db55; }
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx">         // Blog Title
</span><span class="cx">         ?&gt;
</span><del>-        &lt;label for=&quot;blog_title&quot;&gt;&lt;?php _e('Blog Title:') ?&gt;&lt;/label&gt;        
</del><ins>+        &lt;label for=&quot;blog_title&quot;&gt;&lt;?php _e('Blog Title:') ?&gt;&lt;/label&gt;
</ins><span class="cx">         &lt;?php if ( $errmsg = $errors-&gt;get_error_message('blog_title') ) { ?&gt;
</span><span class="cx">                 &lt;p class=&quot;error&quot;&gt;&lt;?php echo $errmsg ?&gt;&lt;/p&gt;
</span><span class="cx">         &lt;?php }
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">         &lt;div id=&quot;privacy&quot;&gt;
</span><span class="cx">         &lt;p class=&quot;privacy-intro&quot;&gt;
</span><span class="cx">             &lt;label for=&quot;blog_public_on&quot;&gt;&lt;?php _e('Privacy:') ?&gt;&lt;/label&gt;
</span><del>-            &lt;?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?&gt; 
</del><ins>+            &lt;?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?&gt;
</ins><span class="cx">             &lt;div style=&quot;clear:both;&quot;&gt;&lt;/div&gt;
</span><span class="cx">             &lt;label class=&quot;checkbox&quot; for=&quot;blog_public_on&quot;&gt;
</span><span class="cx">                 &lt;input type=&quot;radio&quot; id=&quot;blog_public_on&quot; name=&quot;blog_public&quot; value=&quot;1&quot; &lt;?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?&gt;checked=&quot;checked&quot;&lt;?php } ?&gt; /&gt;
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">             &lt;/label&gt;
</span><span class="cx">         &lt;/p&gt;
</span><span class="cx">         &lt;/div&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;?php
</span><span class="cx">         do_action('signup_blogform', $errors);
</span><span class="cx"> }
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">         &lt;label for=&quot;user_email&quot;&gt;&lt;?php _e('Email&amp;nbsp;Address:') ?&gt;&lt;/label&gt;
</span><span class="cx">         &lt;?php if ( $errmsg = $errors-&gt;get_error_message('user_email') ) { ?&gt;
</span><span class="cx">                 &lt;p class=&quot;error&quot;&gt;&lt;?php echo $errmsg ?&gt;&lt;/p&gt;
</span><del>-        &lt;?php } ?&gt;                
</del><ins>+        &lt;?php } ?&gt;
</ins><span class="cx">         &lt;input name=&quot;user_email&quot; type=&quot;text&quot; id=&quot;user_email&quot; value=&quot;&lt;?php  echo esc_attr($user_email) ?&gt;&quot; maxlength=&quot;200&quot; /&gt;&lt;br /&gt;&lt;?php _e('(We&amp;#8217;ll send your password to this address, so &lt;strong&gt;triple-check it&lt;/strong&gt;.)') ?&gt;
</span><span class="cx">         &lt;?php
</span><span class="cx">         if ( $errmsg = $errors-&gt;get_error_message('generic') ) {
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> 
</span><span class="cx"> function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
</span><span class="cx">         global $current_user, $current_site;
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( ! is_wp_error($errors) ) {
</span><span class="cx">                 $errors = new WP_Error();
</span><span class="cx">         }
</span><span class="lines">@@ -163,9 +163,9 @@
</span><span class="cx">         }
</span><span class="cx">         ?&gt;
</span><span class="cx">         &lt;p&gt;&lt;?php printf(__(&quot;Welcome back, %s. By filling out the form below, you can &lt;strong&gt;add another blog to your account&lt;/strong&gt;. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly.&quot;), $current_user-&gt;display_name) ?&gt;&lt;/p&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;?php
</span><del>-        $blogs = get_blogs_of_user($current_user-&gt;ID);        
</del><ins>+        $blogs = get_blogs_of_user($current_user-&gt;ID);
</ins><span class="cx">         if ( !empty($blogs) ) { ?&gt;
</span><span class="cx">                 &lt;p&gt;
</span><span class="cx">                         &lt;?php _e('Blogs you are already a member of:') ?&gt;
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx">                         &lt;/ul&gt;
</span><span class="cx">                 &lt;/p&gt;
</span><span class="cx">         &lt;?php } ?&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;p&gt;&lt;?php _e(&quot;If you&amp;#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!&quot;) ?&gt;&lt;/p&gt;
</span><span class="cx">         &lt;form id=&quot;setupform&quot; method=&quot;post&quot; action=&quot;wp-signup.php&quot;&gt;
</span><span class="cx">                 &lt;input type=&quot;hidden&quot; name=&quot;stage&quot; value=&quot;gimmeanotherblog&quot; /&gt;
</span><span class="lines">@@ -238,13 +238,13 @@
</span><span class="cx">         $errors = $filtered_results['errors'];
</span><span class="cx"> 
</span><span class="cx">         ?&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;h2&gt;&lt;?php printf( __('Get your own %s account in seconds'), $current_site-&gt;site_name ) ?&gt;&lt;/h2&gt;
</span><span class="cx">         &lt;form id=&quot;setupform&quot; method=&quot;post&quot; action=&quot;wp-signup.php&quot;&gt;
</span><span class="cx">                 &lt;input type=&quot;hidden&quot; name=&quot;stage&quot; value=&quot;validate-user-signup&quot; /&gt;
</span><span class="cx">                 &lt;?php do_action( &quot;signup_hidden_fields&quot; ); ?&gt;
</span><span class="cx">                 &lt;?php show_user_form($user_name, $user_email, $errors); ?&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 &lt;p&gt;
</span><span class="cx">                 &lt;?php if( $active_signup == 'blog' ) { ?&gt;
</span><span class="cx">                         &lt;input id=&quot;signupblog&quot; type=&quot;hidden&quot; name=&quot;signup_for&quot; value=&quot;blog&quot; /&gt;
</span><span class="lines">@@ -252,13 +252,13 @@
</span><span class="cx">                         &lt;input id=&quot;signupblog&quot; type=&quot;hidden&quot; name=&quot;signup_for&quot; value=&quot;user&quot; /&gt;
</span><span class="cx">                 &lt;?php } else { ?&gt;
</span><span class="cx">                         &lt;input id=&quot;signupblog&quot; type=&quot;radio&quot; name=&quot;signup_for&quot; value=&quot;blog&quot; &lt;?php echo $signup['blog'] ?&gt; /&gt;
</span><del>-                        &lt;label class=&quot;checkbox&quot; for=&quot;signupblog&quot;&gt;&lt;?php _e('Gimme a blog!') ?&gt;&lt;/label&gt;        
-                        &lt;br /&gt;                        
-                        &lt;input id=&quot;signupuser&quot; type=&quot;radio&quot; name=&quot;signup_for&quot; value=&quot;user&quot; &lt;?php echo $signup['user'] ?&gt; /&gt;                        
</del><ins>+                        &lt;label class=&quot;checkbox&quot; for=&quot;signupblog&quot;&gt;&lt;?php _e('Gimme a blog!') ?&gt;&lt;/label&gt;
+                        &lt;br /&gt;
+                        &lt;input id=&quot;signupuser&quot; type=&quot;radio&quot; name=&quot;signup_for&quot; value=&quot;user&quot; &lt;?php echo $signup['user'] ?&gt; /&gt;
</ins><span class="cx">                         &lt;label class=&quot;checkbox&quot; for=&quot;signupuser&quot;&gt;&lt;?php _e('Just a username, please.') ?&gt;&lt;/label&gt;
</span><span class="cx">                 &lt;?php } ?&gt;
</span><span class="cx">                 &lt;/p&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 &lt;p class=&quot;submit&quot;&gt;&lt;input type=&quot;submit&quot; name=&quot;submit&quot; class=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Next') ?&gt;&quot; /&gt;&lt;/p&gt;
</span><span class="cx">         &lt;/form&gt;
</span><span class="cx">         &lt;?php
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
</span><span class="cx">         ?&gt;
</span><span class="cx">         &lt;h2&gt;&lt;?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), &quot;&lt;a href='http://{$domain}{$path}'&gt;{$blog_title}&lt;/a&gt;&quot; ) ?&gt;&lt;/h2&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;p&gt;&lt;?php _e('But, before you can start using your blog, &lt;strong&gt;you must activate it&lt;/strong&gt;.') ?&gt;&lt;/p&gt;
</span><span class="cx">         &lt;p&gt;&lt;?php printf(__('Check your inbox at &lt;strong&gt;%s&lt;/strong&gt; and click the link given. It should arrive within 30 minutes.'),  $user_email) ?&gt;&lt;/p&gt;
</span><span class="cx">         &lt;p&gt;&lt;?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?&gt;&lt;/p&gt;
</span></span></pre>
</div>
</div>

</body>
</html>