diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-26 15:40:12 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-26 15:40:12 +0000 |
| commit | a4383a13a1522aa6b9db861b732249d0a3897140 (patch) | |
| tree | f8e3465a0aa68577fb452ca1a1e020cb1ae49571 /wp-includes/formatting.php | |
| parent | e9274e601b49af6a87b2c79d356910114bbdcfbc (diff) | |
| download | wordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.tar.gz wordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.tar.xz wordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@595 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/formatting.php')
| -rw-r--r-- | wp-includes/formatting.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 61cd1b2..7d52ed9 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1044,6 +1044,8 @@ function htmlentities2($myHTML) { // Escape single quotes, specialchar double quotes, and fix line endings. function js_escape($text) { $text = wp_specialchars($text, 'double'); - return preg_replace("/\r?\n/", "\\n", addslashes($text)); + $text = str_replace(''', "'", $text); + return preg_replace("/\r?\n/", "\\n", addslashes($text)); } + ?> |