| 12345678910111213141516171819202122232425262728293031323334 |
- Index: wp-includes/formatting.php
- --- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
- +++ wp-includes/formatting.php 2007-02-13 13:48:07 +0100
- @@ -80,7 +80,7 @@
- $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
- $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
- if ( strstr( $pee, '<pre' ) )
- - $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '</pre>' ", $pee);
- + $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '</pre>' ", $pee);
- $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
- /**/
- return $pee;
- Index: wp-login.php
- --- wp-login.php.orig 2006-12-21 11:10:04 +0100
- +++ wp-login.php 2007-02-13 13:47:46 +0100
- @@ -114,7 +114,7 @@
- // Now insert the new pass md5'd into the db
- $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
- $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n";
- - $message .= get_option('siteurl') . "\r\n\r\n";
- + $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n";
- $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
- $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
- $message .= get_option('siteurl') . "/wp-login.php?action=rp&key=$key\r\n";
- @@ -188,7 +188,7 @@
- wp_cache_delete($user->user_login, 'userlogins');
- $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
- $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
- - $message .= get_option('siteurl') . "/wp-login.php\r\n";
- + $message .= sprintf(__('Login: %s'), get_option('siteurl') . "/wp-login.php") . "\r\n";
-
- if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
|
