瀏覽代碼

do not strip all backslashes, only those introduced by preg_replace -- without this all code fragments with backslashes are garbled

Ralf S. Engelschall 19 年之前
父節點
當前提交
703a95fc86
共有 1 個文件被更改,包括 13 次插入1 次删除
  1. 13 1
      wordpress/wordpress.patch

+ 13 - 1
wordpress/wordpress.patch

@@ -1,6 +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-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-10 22:29:05 +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'");