!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '' ", $pee);
d11 1
a11 1
/**/
d14 2
a15 2
--- wp-login.php.orig 2006-12-21 11:10:04 +0100
+++ wp-login.php 2007-02-14 11:32:46 +0100
d35 3
a37 3
--- 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 @@@@
a45 7
@@@@ -161,4 +161,4 @@@@
$pop3->quit();
-?>
\ No newline at end of file
+?>
@
1.3.2.1
log
@file wordpress.patch was added on branch OPENPKG_2_STABLE on 2007-03-18 23:33:36 +0000
@
text
@d1 52
@
1.3.2.2
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@a0 52
Index: wp-includes/formatting.php
--- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
+++ wp-includes/formatting.php 2007-02-14 11:32:46 +0100
@@@@ -80,7 +80,7 @@@@
$pee = preg_replace('!(?' . $allblocks . '[^>]*>)\s* !', "$1", $pee);
$pee = preg_replace('! (\s*?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
if ( strstr( $pee, '
)(.*?)
!ise', " stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee);
+ $pee = preg_replace('!()(.*?)!ise', " wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . '' ", $pee);
$pee = preg_replace( "|\n$|", '', $pee );
/**/
return $pee;
Index: wp-login.php
--- wp-login.php.orig 2006-12-21 11:10:04 +0100
+++ wp-login.php 2007-02-14 11:32: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('
' . __('The e-mail could not be sent.') . " \n" . __('Possible reason: your host may have disabled the mail() function...') . '
');
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
+?>
@
1.2
log
@do not strip all backslashes, only those introduced by preg_replace -- without this all code fragments with backslashes are garbled
@
text
@d3 1
a3 1
+++ wp-includes/formatting.php 2007-02-13 13:48:07 +0100
d15 1
a15 1
+++ wp-login.php 2007-02-13 13:47:46 +0100
d34 19
@
1.1
log
@little bit of cosmetics to the sent mails
@
text
@d1 12
d15 1
a15 1
+++ wp-login.php 2007-02-10 22:29:05 +0100
@