Ticket #23307: 23307.2.diff

src/wp-includes/shortcodes.php

@@ -306 +306 @@
  * @return array List of attributes and their value.
  */
 function shortcode_parse_atts($text) {
+        if ( empty( trim( $text ) ) ) {
+                return array();
+        }
         $atts = array();
         $pattern = '/(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
         $text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
@@ -323 +326 @@
                                 $atts[] = stripcslashes($m[8]);
                 }
         } else {
-                $atts = ltrim($text);
+                $atts[] = ltrim( $text );
         }
         return $atts;
 }

tests/phpunit/tests/shortcode.php

@@ -75 +75 @@
 
         function test_noatts() {
                 do_shortcode('[test-shortcode-tag /]');
-                $this->assertEquals( '', $this->atts );
+                $this->assertEmpty( $this->atts );
                 $this->assertEquals( 'test-shortcode-tag', $this->tagname );
         }
 
@@ -127 +127 @@
 
         function test_noatts_enclosing() {
                 do_shortcode('[test-shortcode-tag]content[/test-shortcode-tag]');
-                $this->assertEquals( '', $this->atts );
+                $this->assertEmpty( $this->atts );
                 $this->assertEquals( 'content', $this->content );
                 $this->assertEquals( 'test-shortcode-tag', $this->tagname );
         }
@@ -149 +149 @@
         function test_unclosed() {
                 $out = do_shortcode('[test-shortcode-tag]');
                 $this->assertEquals( '', $out );
-                $this->assertEquals( '', $this->atts );
+                $this->assertEmpty( $this->atts );
                 $this->assertEquals( 'test-shortcode-tag', $this->tagname );
         }