Changeset 27761

Timestamp:

03/27/2014 12:00:17 AM (11 years ago)

Author:

nacin

Message:

Remove select and input from wpautop()'s HTML blocks list.

props rachelbaker, DH-Shredder.
fixes #22230.

Location:

trunk

Files:

• src/wp-admin/js/editor.js (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Autop.php (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -204 +204 @@
         var preserve_linebreaks = false,
             preserve_br = false,
-            blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select' +
-                '|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
+            blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre' +
+                '|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
                 '|article|aside|hgroup|header|footer|nav|figure|details|menu|summary';
 

trunk/src/wp-includes/formatting.php

@@ -235 +235 @@
     $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
     // Space things out a little
-    $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary)';
+    $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary)';
     $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
     $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);

trunk/tests/phpunit/tests/formatting/Autop.php

@@ -264 +264 @@
         $this->assertEquals( $expected2, trim( wpautop( $content2 ) ) );
     }
+
+    /**
+     * wpautop() Should not add <br/> to "<select>" or "<option>" elements
+     *
+     * @ticket 22230
+     */
+    public function test_skip_select_option_elements() {
+        $str = 'Country: <select id="state" name="state"><option value="1">Alabama</option><option value="2">Alaska</option><option value="3">Arizona</option><option value="4">Arkansas</option><option value="5">California</option></select>';
+        $this->assertEquals( "<p>$str</p>", trim( wpautop( $str ) ) );
+    }
 }