Changes in branches/2.8 [11805:11769]
- Location:
- branches/2.8
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.8/readme.html
r11805 r11769 9 9 <h1 id="logo" style="text-align: center"> 10 10 <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /> 11 <br /> Version 2.8. 411 <br /> Version 2.8.3 12 12 </h1> 13 13 <p style="text-align: center">Semantic Personal Publishing Platform</p> … … 30 30 <h1>Upgrading</h1> 31 31 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p> 32 <h2>Upgrading from any previous WordPress to 2.8. 4:</h2>32 <h2>Upgrading from any previous WordPress to 2.8.3:</h2> 33 33 <ol> 34 34 <li>Delete your old WP files, saving ones you've modified.</li> -
branches/2.8/wp-includes/version.php
r11805 r11769 9 9 * @global string $wp_version 10 10 */ 11 $wp_version = '2.8. 4';11 $wp_version = '2.8.3'; 12 12 13 13 /** -
branches/2.8/wp-login.php
r11805 r11769 162 162 $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 163 163 $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; 164 $message .= site_url("wp-login.php?action=rp&key=$key &login=" . rawurlencode($user_login), 'login') . "\r\n";164 $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n"; 165 165 166 166 $title = sprintf(__('[%s] Password Reset'), get_option('blogname')); … … 183 183 * @return bool|WP_Error 184 184 */ 185 function reset_password($key , $login) {185 function reset_password($key) { 186 186 global $wpdb; 187 187 188 188 $key = preg_replace('/[^a-z0-9]/i', '', $key); 189 189 190 if ( empty( $key ) || !is_string( $key ))190 if ( empty( $key ) ) 191 191 return new WP_Error('invalid_key', __('Invalid key')); 192 192 193 if ( empty($login) || !is_string($login) ) 194 return new WP_Error('invalid_key', __('Invalid key')); 195 196 $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $key, $login)); 193 $user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s", $key)); 197 194 if ( empty( $user ) ) 198 195 return new WP_Error('invalid_key', __('Invalid key')); … … 374 371 case 'resetpass' : 375 372 case 'rp' : 376 $errors = reset_password($_GET['key'] , $_GET['login']);373 $errors = reset_password($_GET['key']); 377 374 378 375 if ( ! is_wp_error($errors) ) {
Note: See TracChangeset
for help on using the changeset viewer.