Ticket #22230: 22230.3.patch

src/wp-includes/formatting.php

@@ -234 +234 @@
 
         $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);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines

tests/phpunit/tests/formatting/Autop.php

@@ -263 +263 @@
                 $this->assertEquals( $expected1, trim( wpautop( $content1 ) ) );
                 $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 ) ) );
+        }
 }