<!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"> ?>
</span><del>- <style type="text/css">
</del><ins>+ <style type="text/css">
</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"> <div id="content" class="widecolumn">
</span><span class="cx"> <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h2><?php _e('Activation Key Required') ?></h2>
</span><span class="cx"> <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
</span><span class="cx"> <p>
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
</span><span class="cx"> $signup = $result->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"> ?>
</span><span class="cx"> <h2><?php _e('Your account is now active!'); ?></h2>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="signup-welcome">
</span><span class="cx"> <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
</span><span class="cx"> <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
</span><span class="cx"> <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
</span><span class="cx"> <?php else: ?>
</span><span class="cx"> <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
</span><span class="cx"> <?php endif;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</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 = "categories.php?taxonomy=$taxonomy&amp;post_type=$post_type";
</span><span class="cx"> } else {
</span><span class="cx"> $parent_file = 'edit.php';
</span><del>- $submenu_file = "categories.php?taxonomy=$taxonomy";
</del><ins>+ $submenu_file = "categories.php?taxonomy=$taxonomy";
</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 = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
</span><span class="cx"> } else {
</span><span class="cx"> $parent_file = 'edit.php';
</span><del>- $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
</del><ins>+ $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( '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("\n", $this->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->get_item_quantity() ) {
</span><span class="cx"> echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links&hellip; yet. It&#8217;s okay &#8212; there is no rush.') . "</p>\n";
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__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 "</ul>\n";
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__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 '</p></div>';
</span><span class="cx"> }
</span><span class="cx"> } elseif ( !$rss->get_item_quantity() ) {
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__destruct();
</ins><span class="cx"> unset($rss);
</span><span class="cx"> return false;
</span><span class="cx"> } else {
</span><span class="cx"> echo '<div class="rss-widget">';
</span><span class="cx"> wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
</span><span class="cx"> echo '</div>';
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__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 "<h4>$label</h4>\n";
</span><span class="cx"> echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
</span><span class="cx"> echo "<p>$description</p>\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> $$feed->__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->get_title()));
</del><ins>+ $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
</ins><span class="cx"> $rss->__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"> <div class="imgedit-menu">
</span><span class="cx"> <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?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') ) { ?>
</span><span class="cx"> <div class="imgedit-rleft" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
</span><span class="cx"> <div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <div class="imgedit-group-top">
</span><span class="cx"> <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a>
</span><span class="cx"> <div class="imgedit-help">
</span><del>- <p><?php _e('Discard any changes and restore the original image.');
</del><ins>+ <p><?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' => array(
</span><span class="cx"> 'label' => __('Title'),
</span><span class="lines">@@ -1223,11 +1223,11 @@
</span><span class="cx"> <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
</span><span class="cx"> if ( !empty( $media_dims ) )
</span><span class="cx"> $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
</span><del>-
</del><ins>+
</ins><span class="cx"> echo "</td></tr>\n";
</span><span class="cx">
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> $item .= "
</span><span class="cx"> </thead>
</span><span class="cx"> <tbody>
</span><span class="lines">@@ -1248,12 +1248,12 @@
</span><span class="cx"> $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
</span><span class="cx"> } elseif ( !MEDIA_TRASH ) {
</span><span class="cx"> $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
</span><del>- <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
- <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
</del><ins>+ <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
+ <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
</ins><span class="cx"> <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
</span><span class="cx"> </div>";
</span><span class="cx"> } else {
</span><del>- $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
</del><ins>+ $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
</ins><span class="cx"> <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
</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' => 'Plugin Name',
- 'PluginURI' => 'Plugin URI',
- 'Version' => 'Version',
- 'Description' => 'Description',
- 'Author' => 'Author',
- 'AuthorURI' => 'Author URI',
- 'TextDomain' => 'Text Domain',
- 'DomainPath' => 'Domain Path'
</del><ins>+ $default_headers = array(
+ 'Name' => 'Plugin Name',
+ 'PluginURI' => 'Plugin URI',
+ 'Version' => 'Version',
+ 'Description' => 'Description',
+ 'Author' => 'Author',
+ 'AuthorURI' => 'Author URI',
+ 'TextDomain' => 'Text Domain',
+ 'DomainPath' => '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 = &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 = &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->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
</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 "<div class='sidebar-description'>\n";
</span><del>- echo "\t<p class='description'>$description</p>";
</del><ins>+ echo "\t<p class='description'>$description</p>";
</ins><span class="cx"> echo "</div>\n";
</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 > 250 && 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("parent_file", $parent_file); // For plugins to move submenu tabs around.
</del><ins>+$parent_file = apply_filters("parent_file", $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') . ' <strong>*</strong>', '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'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
- $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15;
</del><ins>+ $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
+ $num = ( isset($_GET['num'] ) && 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 = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
</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) && !empty($lang_files) ) {
</span><span class="cx"> ?>
</span><del>- <tr valign="top">
- <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
</del><ins>+ <tr valign="top">
+ <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <select name="WPLANG" id="WPLANG">
</span><span class="cx"> <?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?>
</span><span class="cx"> </select>
</span><span class="cx"> </td>
</span><del>- </tr>
</del><ins>+ </tr>
</ins><span class="cx"> <?php
</span><span class="cx"> } // languages
</span><span class="cx"> ?>
</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"> </form>
</span><span class="cx"> <?php if ( !is_multisite || is_super_admin() ) { ?>
</span><span class="cx"> <?php if ($iis7_permalinks) :
</span><del>- if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
</del><ins>+ if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
</ins><span class="cx"> if ( file_exists($home_path . 'web.config') ) : ?>
</span><span class="cx"> <p><?php _e('If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
</span><span class="cx"> <form action="options-permalink.php" method="post">
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> <?php wp_nonce_field('update-permalink') ?>
</span><span class="cx"> <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
</span><span class="cx"> </form>
</span><del>-<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
</del><ins>+<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php else :
</span></span></pre></div>
<a id="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('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
</span><del>-
</del><ins>+
</ins><span class="cx"> if(photostorage == false) {
</span><span class="cx"> jQuery.ajax({
</span><span class="cx"> type: "GET",
</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("allowed_themes", get_site_allowed_themes() );
</del><ins>+ $allowed_themes = apply_filters("allowed_themes", 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() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->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() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->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"> <?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' => 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->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->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' => '',
</span><span class="cx"> 'ID' => '',
</span><span class="cx"> 'karma' => '',
</span><del>- 'number' => '',
- 'offset' => '',
- 'orderby' => '',
- 'order' => 'DESC',
</del><ins>+ 'number' => '',
+ 'offset' => '',
+ 'orderby' => '',
+ 'order' => 'DESC',
</ins><span class="cx"> 'parent' => '',
</span><span class="cx"> 'post_ID' => '',
</span><span class="cx"> 'post_id' => 0,
</span><del>- 'status' => '',
</del><ins>+ 'status' => '',
</ins><span class="cx"> 'type' => '',
</span><span class="cx"> 'user_id' => '',
</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->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->prepare( 'comment_author_email = %s AND ', $author_email );
</span><span class="cx"> if ( '' !== $karma )
</span><span class="cx"> $post_where .= $wpdb->prepare( 'comment_karma = %d AND ', $karma );
</span><span class="cx"> if ( 'comment' == $type )
</span><span class="cx"> $post_where .= "comment_type = '' AND ";
</span><del>- elseif ( ! empty( $type ) )
</del><ins>+ elseif ( ! empty( $type ) )
</ins><span class="cx"> $post_where .= $wpdb->prepare( 'comment_type = %s AND ', $type );
</span><span class="cx"> if ( '' !== $parent )
</span><span class="cx"> $post_where .= $wpdb->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') && ( (int) @ini_get('memory_limit') < 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->get_item_quantity() ) {
</span><span class="cx"> echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__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 '</ul>';
</span><del>- $rss->__destruct();
</del><ins>+ $rss->__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' => 1,
</span><span class="cx"> 'title_li' => '',
</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' => '<br />',
</del><ins>+ 'after' => '<br />',
</ins><span class="cx"> 'before' => '',
</span><span class="cx"> 'between' => ' ',
</span><span class="cx"> 'categorize' => 0,
</span><del>- 'category' => '',
</del><ins>+ 'category' => '',
</ins><span class="cx"> 'echo' => true,
</span><del>- 'limit' => -1,
</del><ins>+ 'limit' => -1,
</ins><span class="cx"> 'orderby' => 'name',
</span><del>- 'show_description' => true,
- 'show_images' => true,
</del><ins>+ 'show_description' => true,
+ 'show_images' => true,
</ins><span class="cx"> 'show_rating' => false,
</span><span class="cx"> 'show_updated' => true,
</span><span class="cx"> 'title_li' => '',
</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('/(<.*>|\[.*\])/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) && '<' != $curl{0} && '[' != $curl{0}
</span><del>- && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
</del><ins>+ && empty($no_texturize_shortcodes_stack) && 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. <pre>) even if there was invalid nesting before that
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Example: in the case <pre>sadsadasd</code>"baba"</pre>
</span><span class="cx"> * "baba" 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("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
</span><span class="cx"> $allowed = false;
</span><span class="cx"> foreach ( $mimes as $ext_preg => $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( "add_option_{$name}", $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' => 'audio/ogg',
</span><span class="cx"> 'mid|midi' => 'audio/midi',
</span><span class="cx"> 'wma' => 'audio/wma',
</span><del>- 'mka' => 'audio/x-matroska',
- 'mkv' => 'video/x-matroska',
</del><ins>+ 'mka' => 'audio/x-matroska',
+ 'mkv' => 'video/x-matroska',
</ins><span class="cx"> 'rtf' => 'application/rtf',
</span><span class="cx"> 'js' => 'application/javascript',
</span><span class="cx"> 'pdf' => '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="selected" ';
</span><span class="cx"> $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> $structure[] = '</optgroup>';
</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 "extra_<$context>_headers"
</del><ins>+ * @param string $context If specified adds filter hook "extra_<$context>_headers"
</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 => $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' => 'loginform',
</span><span class="cx"> 'label_username' => __( 'Username' ),
</span><span class="cx"> 'label_password' => __( 'Password' ),
</span><del>- 'label_remember' => __( 'Remember Me' ),
- 'label_log_in' => __( 'Log In' ),
- 'id_username' => 'user_login',
- 'id_password' => 'user_pass',
- 'id_remember' => 'rememberme',
- 'id_submit' => 'wp-submit',
- 'remember' => true,
</del><ins>+ 'label_remember' => __( 'Remember Me' ),
+ 'label_log_in' => __( 'Log In' ),
+ 'id_username' => 'user_login',
+ 'id_password' => 'user_pass',
+ 'id_remember' => 'rememberme',
+ 'id_submit' => 'wp-submit',
+ 'remember' => true,
</ins><span class="cx"> 'value_username' => '',
</span><span class="cx"> 'value_remember' => false, // Set this to true to default the "Remember me" 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"> <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . site_url( 'wp-login.php', 'login' ) . '" method="post">
</span><span class="cx"> ' . do_action( 'login_form_top' ) . '
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> ' . do_action( 'login_form_bottom' ) . '
</span><span class="cx"> </form>';
</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 < 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 &&
</del><ins>+ if ( ! inputs[i].checked &&
</ins><span class="cx"> ( 'left' == side && 1 > checkCount || 'right' == side && 1 < checkCount && ( ! inputs[i-1] || ! inputs[i-1].checked ) ) &&
</span><span class="cx"> ! ( inputs[i+1] && inputs[i+1].checked && '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 && w.addEventListener )
</del><ins>+ if ( w && w.addEventListener )
</ins><span class="cx"> w.addEventListener('load', init, false);
</span><span class="cx"> else if ( w && 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->merge_with( $l10n[$domain] );
</span><span class="cx">
</span><span class="cx"> $l10n[$domain] = &$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 = '&action=edit';
</span><span class="cx">
</span><del>- $post_type_object = get_post_type_object( $post->post_type );
</del><ins>+ $post_type_object = get_post_type_object( $post->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 > 0 ? floor(100/$columns) : 100;
</span><del>- $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left';
-
</del><ins>+ $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left';
+
</ins><span class="cx"> $selector = "gallery-{$instance}";
</span><span class="cx">
</span><span class="cx"> $output = apply_filters('gallery_style', "
</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->get_results("SELECT ID FROM $wpdb->posts") )
</span><span class="cx"> die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
</span><del>-
</del><ins>+
</ins><span class="cx"> $wpdb->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->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $blogroll_id == null ) {
</span><span class="cx"> $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
</span><span class="cx"> $blogroll_id = $wpdb->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->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->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->comment_author_IP);
</span><span class="cx"> $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
</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->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->user_login);
</span><span class="cx"> $user_email = stripslashes($user->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 "Posts page" in Reading Settings.
</del><ins>+ * only be true on the page which you set as the "Posts page" 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->capability_type;
</del><ins>+ $post_type_cap = $post_type_object->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 ) && is_array( $post_type ) ) {
</span><del>- $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
</del><ins>+ $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
</ins><span class="cx"> } elseif ( ! empty( $post_type ) ) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type = '$post_type'";
</span><span class="cx"> } elseif ( $this->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->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'"));
</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."<rules>".$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."<rule name=\"wordpress\" patternSyntax=\"Wildcard\">".$end_of_line;
</span><span class="cx"> $rules .= $extra_indent.$indent."<match url=\"*\" />".$end_of_line;
</span><span class="cx"> $rules .= $extra_indent.$indent.$indent."<conditions>".$end_of_line;
</span><span class="lines">@@ -1744,7 +1744,7 @@
</span><span class="cx"> $rules .= $extra_indent.$indent.$indent."</conditions>".$end_of_line;
</span><span class="cx"> $rules .= $extra_indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line;
</span><span class="cx"> $rules .= $extra_indent."</rule>";
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $add_parent_tags ) {
</span><span class="cx"> $rules .= $end_of_line.$indent.$indent.$indent."</rules>".$end_of_line;
</span><span class="cx"> $rules .= $indent.$indent."</rewrite>".$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' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
</span><span class="cx"> 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
</span><span class="cx"> ) );
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8');
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", 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' => 'Theme Name',
- 'URI' => 'Theme URI',
- 'Description' => 'Description',
- 'Author' => 'Author',
</del><ins>+ $default_headers = array(
+ 'Name' => 'Theme Name',
+ 'URI' => 'Theme URI',
+ 'Description' => 'Description',
+ 'Author' => 'Author',
</ins><span class="cx"> 'AuthorURI' => 'Author URI',
</span><del>- 'Version' => 'Version',
- 'Template' => 'Template',
- 'Status' => 'Status',
</del><ins>+ 'Version' => 'Version',
+ 'Template' => 'Template',
+ 'Status' => 'Status',
</ins><span class="cx"> 'Tags' => '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->$field) || is_numeric($user->$field) )
</del><ins>+ if ( is_string($user->$field) || is_numeric($user->$field) )
</ins><span class="cx"> $user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
</span><span class="cx"> }
</span><span class="cx"> $user->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') && SAVEQUERIES )
</span><span class="cx"> $this->timer_start();
</span><del>-
</del><ins>+
</ins><span class="cx"> // use $this->dbh for read ops, and $this->dbhwrite for write ops
</span><span class="cx"> // use $this->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"> ?>
</span><del>- <style type="text/css">
</del><ins>+ <style type="text/css">
</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="submit"],
</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"> ?>
</span><del>- <label for="blog_title"><?php _e('Blog Title:') ?></label>
</del><ins>+ <label for="blog_title"><?php _e('Blog Title:') ?></label>
</ins><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="cx"> <?php }
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> <div id="privacy">
</span><span class="cx"> <p class="privacy-intro">
</span><span class="cx"> <label for="blog_public_on"><?php _e('Privacy:') ?></label>
</span><del>- <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
</del><ins>+ <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
</ins><span class="cx"> <div style="clear:both;"></div>
</span><span class="cx"> <label class="checkbox" for="blog_public_on">
</span><span class="cx"> <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> </label>
</span><span class="cx"> </p>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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"> <label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
</span><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><del>- <?php } ?>
</del><ins>+ <?php } ?>
</ins><span class="cx"> <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
</span><span class="cx"> <?php
</span><span class="cx"> if ( $errmsg = $errors->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"> ?>
</span><span class="cx"> <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>- $blogs = get_blogs_of_user($current_user->ID);
</del><ins>+ $blogs = get_blogs_of_user($current_user->ID);
</ins><span class="cx"> if ( !empty($blogs) ) { ?>
</span><span class="cx"> <p>
</span><span class="cx"> <?php _e('Blogs you are already a member of:') ?>
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> </p>
</span><span class="cx"> <?php } ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
</span><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="lines">@@ -238,13 +238,13 @@
</span><span class="cx"> $errors = $filtered_results['errors'];
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
</span><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="validate-user-signup" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_user_form($user_name, $user_email, $errors); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><span class="cx"> <?php if( $active_signup == 'blog' ) { ?>
</span><span class="cx"> <input id="signupblog" type="hidden" name="signup_for" value="blog" />
</span><span class="lines">@@ -252,13 +252,13 @@
</span><span class="cx"> <input id="signupblog" type="hidden" name="signup_for" value="user" />
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
</span><del>- <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
- <br />
- <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
</del><ins>+ <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
+ <br />
+ <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
</ins><span class="cx"> <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
</span><span class="cx"> </form>
</span><span class="cx"> <?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"> ?>
</span><span class="cx"> <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
</span><span class="cx"> <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
</span><span class="cx"> <p><?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?></p>
</span></span></pre>
</div>
</div>
</body>
</html>