|
|
@@ -1,18 +1,18 @@
|
|
|
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 @@
|
|
|
+--- wp-includes/formatting.php.orig 2007-04-13 01:19:16 +0200
|
|
|
++++ wp-includes/formatting.php 2007-05-17 09:47:52 +0200
|
|
|
+@@ -78,7 +78,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' ) )
|
|
|
+ if (strpos($pee, '<pre') !== false)
|
|
|
- $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('!(<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-14 11:32:46 +0100
|
|
|
+--- wp-login.php.orig 2007-04-19 04:53:19 +0200
|
|
|
++++ wp-login.php 2007-05-17 09:20:19 +0200
|
|
|
@@ -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'");
|
|
|
@@ -32,9 +32,9 @@ Index: wp-login.php
|
|
|
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>');
|
|
|
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 @@
|
|
|
+--- wp-mail.php.orig 2007-05-05 04:51:20 +0200
|
|
|
++++ wp-mail.php 2007-05-17 09:20:19 +0200
|
|
|
+@@ -142,7 +142,7 @@
|
|
|
$post_category = $post_categories;
|
|
|
|
|
|
// or maybe we should leave the choice to email drafts? propose a way
|
|
|
@@ -43,10 +43,3 @@ Index: wp-mail.php
|
|
|
|
|
|
$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
|
|
|
-+?>
|
