Ticket #28217: 28217.2.patch

src/wp-admin/js/editor.js

@@ -244 +244 @@
                 pee = pee.replace( new RegExp( '(<(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '\n$1' );
                 pee = pee.replace( new RegExp( '(</(?:' + blocklist + ')>)', 'gi' ), '$1\n\n' );
                 pee = pee.replace( /<hr( [^>]*)?>/gi, '<hr$1>\n\n' ); // hr is self closing block element
+                pee = pee.replace( /\s<option/gi, '<option' ); // No <p> or <br> around <option>
+                pee = pee.replace( /<\/option>\s/gi, '</option>' );
                 pee = pee.replace( /\r\n|\r/g, '\n' );
                 pee = pee.replace( /\n\s*\n+/g, '\n\n' );
                 pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );

src/wp-includes/formatting.php

@@ -340 +340 @@
         $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
 
+        if ( strpos( $pee, '</select>' ) !== false ) {
+                // no P/BR around option
+                $pee = preg_replace( '|\s<option|', '<option', $pee );
+                $pee = preg_replace( '|</option>\s|', '</option>', $pee );
+        }
+
         if ( strpos( $pee, '</object>' ) !== false ) {
                 // no P/BR around param and embed
                 $pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );