|
@@ -1,7 +1,7 @@
|
|
|
Index: wordpress/wp-includes/canonical.php
|
|
Index: wordpress/wp-includes/canonical.php
|
|
|
---- wordpress/wp-includes/canonical.php.orig 2007-10-17 22:15:18 +0200
|
|
|
|
|
-+++ wordpress/wp-includes/canonical.php 2007-12-30 12:55:12 +0100
|
|
|
|
|
-@@ -108,6 +108,12 @@
|
|
|
|
|
|
|
+--- wordpress/wp-includes/canonical.php.orig 2008-02-24 03:09:24 +0100
|
|
|
|
|
++++ wordpress/wp-includes/canonical.php 2008-03-29 22:17:27 +0100
|
|
|
|
|
+@@ -139,6 +139,12 @@
|
|
|
$user_home = @parse_url(get_option('home'));
|
|
$user_home = @parse_url(get_option('home'));
|
|
|
$redirect['host'] = $user_home['host'];
|
|
$redirect['host'] = $user_home['host'];
|
|
|
|
|
|
|
@@ -15,35 +15,34 @@ Index: wordpress/wp-includes/canonical.php
|
|
|
if ( isset($user_home['port']) )
|
|
if ( isset($user_home['port']) )
|
|
|
$redirect['port'] = $user_home['port'];
|
|
$redirect['port'] = $user_home['port'];
|
|
|
Index: wordpress/wp-login.php
|
|
Index: wordpress/wp-login.php
|
|
|
---- wordpress/wp-login.php.orig 2007-09-26 01:17:30 +0200
|
|
|
|
|
-+++ wordpress/wp-login.php 2007-12-30 12:52:53 +0100
|
|
|
|
|
-@@ -115,7 +115,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";
|
|
|
|
|
-@@ -189,7 +189,7 @@
|
|
|
|
|
- wp_cache_delete($user->user_login, 'userlogins');
|
|
|
|
|
|
|
+--- wordpress/wp-login.php.orig 2008-03-26 08:43:52 +0100
|
|
|
|
|
++++ wordpress/wp-login.php 2008-03-29 22:18:53 +0100
|
|
|
|
|
+@@ -99,7 +99,7 @@
|
|
|
|
|
+ $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";
|
|
|
|
|
+@@ -129,7 +129,7 @@
|
|
|
|
|
+ wp_set_password($new_pass, $user->ID);
|
|
|
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
|
|
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
|
|
|
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
|
|
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
|
|
|
- $message .= get_option('siteurl') . "/wp-login.php\r\n";
|
|
- $message .= get_option('siteurl') . "/wp-login.php\r\n";
|
|
|
+ $message .= sprintf(__('Login: %s'), 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)) {
|
|
|
|
|
|
|
+ if ( !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>');
|
|
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
|
|
|
Index: wordpress/wp-mail.php
|
|
Index: wordpress/wp-mail.php
|
|
|
---- wordpress/wp-mail.php.orig 2007-12-29 20:38:47 +0100
|
|
|
|
|
-+++ wordpress/wp-mail.php 2007-12-30 12:52:53 +0100
|
|
|
|
|
-@@ -142,7 +142,7 @@
|
|
|
|
|
- $post_category = $post_categories;
|
|
|
|
|
-
|
|
|
|
|
- // or maybe we should leave the choice to email drafts? propose a way
|
|
|
|
|
-- $post_status = 'publish';
|
|
|
|
|
|
|
+--- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100
|
|
|
|
|
++++ wordpress/wp-mail.php 2008-03-29 22:20:39 +0100
|
|
|
|
|
+@@ -133,6 +133,7 @@
|
|
|
|
|
+ // Author not found in DB, set status to pending. Author already set to admin.
|
|
|
|
|
+ $post_status = 'pending';
|
|
|
|
|
+ }
|
|
|
+ $post_status = 'draft';
|
|
+ $post_status = 'draft';
|
|
|
|
|
|
|
|
- $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
|
|
|
|
|
- $post_data = add_magic_quotes($post_data);
|
|
|
|
|
|
|
+ $subject = trim($subject);
|
|
|
|
|
+
|
