Changeset 11935 for trunk/wp-includes/formatting.php

Timestamp:

09/15/2009 10:11:59 AM (15 years ago)

Author:

azaozz

Message:

Strip \r when escaping strings for JS, props nbachiyski, fixes #7041

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -2200 +2200 @@
 
 /**
- * Escape single quotes, specialchar double quotes, and fix line endings.
- *
+ * Escape single quotes, htmlspecialchar " < > &, and fix line endings.
+ *
+ * Escapes text strings for echoing in JS, both inline (for example in onclick="...")
+ * and inside <script> tag. Note that the strings have to be in single quotes.
  * The filter 'js_escape' is also applied here.
  *
@@ -2213 +2215 @@
     $safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
     $safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-    $safe_text = preg_replace( "/\r?\n/", "\\n", addslashes( $safe_text ) );
+    $safe_text = str_replace( "\r", '', $safe_text );
+    $safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
     return apply_filters( 'js_escape', $safe_text, $text );
 }