Changeset 33187

Timestamp:

07/13/2015 03:18:47 AM (9 years ago)

Author:

azaozz

Message:

TinyMCE:

• Go back to encoding the editor content only when TinyMCE is used.
• Add check and encode </textarea> if present.

See #32425.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (2 diffs)
• default-filters.php (modified) (1 diff)
• formatting.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -252 +252 @@
             'id="' . $editor_id_attr . '">%s</textarea></div>' );
 
+        // Prepare the content for the Visual or Text editor
+        if ( self::$this_tinymce ) {
+            add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
+        }
+
         /**
          * Filter the default editor content.
@@ -269 +274 @@
             _deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
             $content = apply_filters( 'richedit_pre', $content );
+        }
+
+        if ( false !== stripos( $content, 'textarea' ) ) {
+            $content = preg_replace( '%</textarea%i', '&lt;/textarea', $content );
         }
 

trunk/src/wp-includes/default-filters.php

@@ -203 +203 @@
 
 add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
-
-// Prepare the content for the Visual or Text editor
-add_filter( 'the_editor_content', 'format_for_editor', 10, 2 );
 
 // Actions

trunk/src/wp-includes/formatting.php

@@ -3088 +3088 @@
  */
 function format_for_editor( $text, $default_editor = null ) {
-    // Back-compat: check if any characters need encoding.
-    if ( ! empty( $text ) && ( false !== strpos( $text, '<' ) || false !== strpos( $text, '>' ) ||
-        preg_match( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', $text ) ) ) {
-
+    if ( $text ) {
         $text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
     }