<!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>[13242] trunk: Variable Cleanup, Unused variables, Typo'd variables,
unused code blocks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13242">13242</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-20 02:01:46 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Variable Cleanup, Unused variables, Typo'd variables, unused code blocks. Fixes <a href="http://trac.wordpress.org/ticket/12299">#12299</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.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="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/media.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -1835,7 +1835,7 @@
</span><span class="cx"> $start = ( $_GET['paged'] - 1 ) * 10;
</span><span class="cx"> if ( $start < 1 )
</span><span class="cx"> $start = 0;
</span><del>- add_filter( 'post_limits', $limit_filter = create_function( '$a', "return 'LIMIT $start, 10';" ) );
</del><ins>+ add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) );
</ins><span class="cx">
</span><span class="cx"> list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/ms.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $id = (int) $id;
</span><del>- $user = get_userdata($id);
</del><span class="cx">
</span><span class="cx"> do_action('wpmu_delete_user', $id);
</span><span class="cx">
</span><span class="lines">@@ -767,4 +766,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'show_post_thumbnail_warning' );
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/post.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx"> function postbox_classes( $id, $page ) {
</span><span class="cx"> if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id )
</span><span class="cx"> return '';
</span><del>- $current_user = wp_get_current_user();
</del><ins>+
</ins><span class="cx"> if ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
</span><span class="cx"> if ( !is_array( $closed ) ) {
</span><span class="cx"> return '';
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/schema.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> * @param int $network_id id of network to populate
</span><span class="cx"> */
</span><span class="cx"> function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $vhost = 'no' ) {
</span><del>- global $wpdb, $current_site, $wp_version, $wp_db_version, $wp_rewrite;
</del><ins>+ global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
</ins><span class="cx">
</span><span class="cx"> $msg = '';
</span><span class="cx"> //@todo: turn these checks into returned messages
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/template.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -2111,7 +2111,7 @@
</span><span class="cx"> if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
</span><span class="cx"> $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
</span><span class="cx"> } elseif ( 'spam' == $the_comment_status ) {
</span><del>- $actions['unspam'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . __( 'Not Spam' ) . '</a>';
</del><ins>+ $actions['unspam'] = "<a href='$unspam_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1 vim-z vim-destructive'>" . __( 'Not Spam' ) . '</a>';
</ins><span class="cx"> } elseif ( 'trash' == $the_comment_status ) {
</span><span class="cx"> $actions['untrash'] = "<a href='$untrash_url' class='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1 vim-z vim-destructive'>" . __( 'Restore' ) . '</a>';
</span><span class="cx"> }
</span><span class="lines">@@ -2678,13 +2678,12 @@
</span><span class="cx"> * @param string $default slug for the role that should be already selected
</span><span class="cx"> */
</span><span class="cx"> function wp_dropdown_roles( $selected = false ) {
</span><del>- global $wp_roles;
</del><span class="cx"> $p = '';
</span><span class="cx"> $r = '';
</span><span class="cx">
</span><span class="cx"> $editable_roles = get_editable_roles();
</span><span class="cx">
</span><del>- foreach( $editable_roles as $role => $details ) {
</del><ins>+ foreach ( $editable_roles as $role => $details ) {
</ins><span class="cx"> $name = translate_user_role($details['name'] );
</span><span class="cx"> if ( $selected == $role ) // Make default first in list
</span><span class="cx"> $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
</span><span class="lines">@@ -3288,7 +3287,7 @@
</span><span class="cx"> <?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
</span><span class="cx"> <label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
</span><span class="cx"> <input type="text" id="find-posts-input" name="ps" value="" />
</span><del>- <input type="button" onclick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
</del><ins>+ <input type="button" onClick="findPosts.send();" value="<?php esc_attr_e( 'Search' ); ?>" class="button" /><br />
</ins><span class="cx">
</span><span class="cx"> <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
</span><span class="cx"> <label for="find-posts-posts"><?php _e( 'Posts' ); ?></label>
</span><span class="lines">@@ -3298,7 +3297,7 @@
</span><span class="cx"> <div id="find-posts-response"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="find-box-buttons">
</span><del>- <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
</del><ins>+ <input type="button" class="button alignleft" onClick="findPosts.close();" value="<?php esc_attr_e('Close'); ?>" />
</ins><span class="cx"> <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -3544,7 +3543,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function screen_meta($screen) {
</span><del>- global $wp_meta_boxes, $_wp_contextual_help, $post_type;
</del><ins>+ global $wp_meta_boxes, $_wp_contextual_help, $title;
</ins><span class="cx">
</span><span class="cx"> if ( is_string($screen) )
</span><span class="cx"> $screen = convert_to_screen($screen);
</span><span class="lines">@@ -3607,8 +3606,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>- global $title;
-
</del><span class="cx"> $_wp_contextual_help = apply_filters('contextual_help_list', $_wp_contextual_help, $screen);
</span><span class="cx"> ?>
</span><span class="cx"> <div id="contextual-help-wrap" class="hidden">
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/theme-install.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -366,8 +366,6 @@
</span><span class="cx"> * @param int $totalpages Number of pages.
</span><span class="cx"> */
</span><span class="cx"> function display_themes($themes, $page = 1, $totalpages = 1) {
</span><del>- global $themes_allowedtags;
-
</del><span class="cx"> $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : '';
</span><span class="cx"> $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : '';
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/theme.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -87,9 +87,6 @@
</span><span class="cx"> return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
</span><span class="cx">
</span><span class="cx"> $themes_dir = trailingslashit( $themes_dir );
</span><del>-
- $errors = array();
-
</del><span class="cx"> $theme_dir = trailingslashit($themes_dir . $template);
</span><span class="cx"> $deleted = $wp_filesystem->delete($theme_dir, true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/includes/user.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -423,7 +423,6 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $id = (int) $id;
</span><del>- $user = new WP_User($id);
</del><span class="cx">
</span><span class="cx"> // allow for transaction statement
</span><span class="cx"> do_action('delete_user', $id);
</span></span></pre></div>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-admin/post.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -51,15 +51,6 @@
</span><span class="cx"> * @param int $post_id Optional. Post ID.
</span><span class="cx"> */
</span><span class="cx"> function redirect_post($post_id = '') {
</span><del>- global $action;
-
- $referredby = '';
- if ( !empty($_POST['referredby']) ) {
- $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
- $referredby = remove_query_arg('_wp_original_http_referer', $referredby);
- }
- $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
-
</del><span class="cx"> if ( !empty($_POST['mode']) && 'sidebar' == $_POST['mode'] ) {
</span><span class="cx"> if ( isset($_POST['saveasdraft']) )
</span><span class="cx"> $location = 'sidebar.php?a=c';
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/comment-template.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> * @return null Returns null on single posts and pages.
</span><span class="cx"> */
</span><span class="cx"> function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
</span><del>- global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post;
</del><ins>+ global $id, $wpcommentspopupfile, $wpcommentsjavascript;
</ins><span class="cx">
</span><span class="cx"> if ( false === $zero ) $zero = __( 'No Comments' );
</span><span class="cx"> if ( false === $one ) $one = __( '1 Comment' );
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/comment.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> $total = 0;
</span><span class="cx"> $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
</span><span class="cx"> $known_types = array_keys( $approved );
</span><del>- foreach( (array) $count as $row_num => $row ) {
</del><ins>+ foreach ( (array) $count as $row ) {
</ins><span class="cx"> // Don't count post-trashed toward totals
</span><span class="cx"> if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
</span><span class="cx"> $total += $row['num_comments'];
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/functions.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> * @return string Date formated by $dateformatstring or locale (if available).
</span><span class="cx"> */
</span><span class="cx"> function mysql2date( $dateformatstring, $mysqlstring, $translate = true ) {
</span><del>- global $wp_locale;
</del><span class="cx"> $m = $mysqlstring;
</span><span class="cx"> if ( empty( $m ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/general-template.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -1352,7 +1352,7 @@
</span><span class="cx"> * @return string|null Null if displaying, string if retrieving.
</span><span class="cx"> */
</span><span class="cx"> function get_the_date( $d = '' ) {
</span><del>- global $post, $day;
</del><ins>+ global $post;
</ins><span class="cx"> $the_date = '';
</span><span class="cx">
</span><span class="cx"> if ( '' == $d )
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/link-template.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -1677,7 +1677,7 @@
</span><span class="cx"> * @return string Markup for pagination links.
</span><span class="cx"> */
</span><span class="cx"> function paginate_comments_links($args = array()) {
</span><del>- global $wp_query, $wp_rewrite;
</del><ins>+ global $wp_rewrite;
</ins><span class="cx">
</span><span class="cx"> if ( !is_singular() || !get_option('page_comments') )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/ms-blogs.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
</span><span class="cx"> $update_details[$field] = $details[$field];
</span><span class="cx">
</span><del>- $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
</del><ins>+ $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
</ins><span class="cx">
</span><span class="cx"> // If spam status changed, issue actions.
</span><span class="cx"> if ( $details[ 'spam' ] != $current_details[ 'spam' ] ) {
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/ms-functions.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -687,8 +687,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
</span><del>- global $current_site;
-
</del><span class="cx"> if ( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -781,8 +779,6 @@
</span><span class="cx"> if ( is_wp_error($user_id) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $user = new WP_User($user_id);
-
</del><span class="cx"> // Newly created users have no roles or caps until they are added to a blog.
</span><span class="cx"> update_user_option($user_id, 'capabilities', '');
</span><span class="cx"> update_user_option($user_id, 'user_level', '');
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/pluggable.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -969,7 +969,6 @@
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="cx"> $post = get_post($comment->comment_post_ID);
</span><span class="cx"> $user = get_userdata( $post->post_author );
</span><del>- $current_user = wp_get_current_user();
</del><span class="cx">
</span><span class="cx"> if ( $comment->user_id == $post->post_author ) return false; // The author moderated a comment on his own post
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/post-template.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_the_content($more_link_text = null, $stripteaser = 0) {
</span><del>- global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
</del><ins>+ global $id, $post, $more, $page, $pages, $multipage, $preview;
</ins><span class="cx">
</span><span class="cx"> if ( null === $more_link_text )
</span><span class="cx"> $more_link_text = __( '(more...)' );
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> * @return array Array of classes.
</span><span class="cx"> */
</span><span class="cx"> function get_body_class( $class = '' ) {
</span><del>- global $wp_query, $wpdb, $current_user;
</del><ins>+ global $wp_query, $wpdb;
</ins><span class="cx">
</span><span class="cx"> $classes = array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/post.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -1429,7 +1429,7 @@
</span><span class="cx"> foreach ( get_post_stati() as $state )
</span><span class="cx"> $stats[$state] = 0;
</span><span class="cx">
</span><del>- foreach ( (array) $count as $row_num => $row )
</del><ins>+ foreach ( (array) $count as $row )
</ins><span class="cx"> $stats[$row['post_status']] = $row['num_posts'];
</span><span class="cx">
</span><span class="cx"> $stats = (object) $stats;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-includes/wp-db.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> if (!$this->$dbhname ) {
</span><span class="cx"> $this->bail("
</span><span class="cx"> <h1>Error establishing a database connection</h1>
</span><del>-<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>$dbhost</code>. This could mean your host's database server is down.</p>
</del><ins>+<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>{$details['db_host']}</code>. This could mean your host's database server is down.</p>
</ins><span class="cx"> <ul>
</span><span class="cx"> <li>Are you sure you have the correct username and password?</li>
</span><span class="cx"> <li>Are you sure that you have typed the correct hostname?</li>
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (13241 => 13242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-02-20 01:45:04 UTC (rev 13241)
+++ trunk/wp-login.php 2010-02-20 02:01:46 UTC (rev 13242)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> do_action('password_reset', $user, $new_pass);
</span><span class="cx">
</span><span class="cx"> wp_set_password($new_pass, $user->ID);
</span><del>- update_user_option($user_ID, 'default_password_nag', true, true); //Set up the Password change nag.
</del><ins>+ update_user_option($user->ID, 'default_password_nag', true, true); //Set up the Password change nag.
</ins><span class="cx"> $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
</span><span class="cx"> $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
</span><span class="cx"> $message .= site_url('wp-login.php', 'login') . "\r\n";
</span></span></pre>
</div>
</div>
</body>
</html>