|
@@ -1,6 +1,6 @@
|
|
|
Index: wp-includes/formatting.php
|
|
Index: wp-includes/formatting.php
|
|
|
--- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
|
|
--- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
|
|
|
-+++ wp-includes/formatting.php 2007-02-13 13:48:07 +0100
|
|
|
|
|
|
|
++++ wp-includes/formatting.php 2007-02-14 11:32:46 +0100
|
|
|
@@ -80,7 +80,7 @@
|
|
@@ -80,7 +80,7 @@
|
|
|
$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
|
|
$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);
|
|
$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
|
|
@@ -12,7 +12,7 @@ Index: wp-includes/formatting.php
|
|
|
return $pee;
|
|
return $pee;
|
|
|
Index: wp-login.php
|
|
Index: wp-login.php
|
|
|
--- wp-login.php.orig 2006-12-21 11:10:04 +0100
|
|
--- wp-login.php.orig 2006-12-21 11:10:04 +0100
|
|
|
-+++ wp-login.php 2007-02-13 13:47:46 +0100
|
|
|
|
|
|
|
++++ wp-login.php 2007-02-14 11:32:46 +0100
|
|
|
@@ -114,7 +114,7 @@
|
|
@@ -114,7 +114,7 @@
|
|
|
// Now insert the new pass md5'd into the db
|
|
// 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'");
|
|
$wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'");
|
|
@@ -31,3 +31,22 @@ Index: wp-login.php
|
|
|
|
|
|
|
|
if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message)) {
|
|
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>');
|
|
die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
|
|
|
|
|
+Index: wp-mail.php
|
|
|
|
|
+--- wp-mail.php.orig 2006-08-30 23:46:31 +0200
|
|
|
|
|
++++ wp-mail.php 2007-02-14 11:36:00 +0100
|
|
|
|
|
+@@ -131,7 +131,7 @@
|
|
|
|
|
+ $post_category = $post_categories;
|
|
|
|
|
+
|
|
|
|
|
+ // or maybe we should leave the choice to email drafts? propose a way
|
|
|
|
|
+- $post_status = 'publish';
|
|
|
|
|
++ $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);
|
|
|
|
|
+@@ -161,4 +161,4 @@
|
|
|
|
|
+
|
|
|
|
|
+ $pop3->quit();
|
|
|
|
|
+
|
|
|
|
|
+-?>
|
|
|
|
|
+\ No newline at end of file
|
|
|
|
|
++?>
|