Ticket #35268: 35268-1.diff

src/wp-includes/general-template.php

@@ -3448 +3448 @@
  * @return string html attribute or empty string
  */
 function __checked_selected_helper( $helper, $current, $echo, $type ) {
-        if ( (string) $helper === (string) $current )
+        $result = '';
+        if ( is_array( $helper ) ) {
+                if ( in_array( (string) $current, $helper, true )  ) {
+                        $result = " $type='$type'";
+                }
+        } else if ( (string) $helper === (string) $current ) {
                 $result = " $type='$type'";
-        else
-                $result = '';
+        }
 
         if ( $echo )
                 echo $result;

tests/phpunit/tests/admin/includesTemplate.php

@@ -7 +7 @@
                 $this->assertEquals(' selected=\'selected\'', selected('foo','foo',false));
                 $this->assertEquals(' checked=\'checked\'', checked('foo','foo',false));
 
+                $this->assertEquals(' selected=\'selected\'', selected(array('bar', 'foo'),'foo',false));
+                $this->assertEquals(' checked=\'checked\'', checked(array('bar', 'foo'), 'foo',false));
+
                 $this->assertEquals(' selected=\'selected\'', selected('1',1,false));
                 $this->assertEquals(' checked=\'checked\'', checked('1',1,false));
 
@@ -39 +42 @@
                 $this->assertEquals('', selected('0','',false));
                 $this->assertEquals('', checked('0','',false));
 
+                $this->assertEquals('', selected(array('bar', 'baz'),'foo',false));
+                $this->assertEquals('', checked(array('bar', 'baz'),'foo',false));
+
                 $this->assertEquals('', selected(0,'',false));
                 $this->assertEquals('', checked(0,'',false));
 
@@ -50 +56 @@
                 global $wp_meta_boxes;
 
                 add_meta_box( 'testbox1', 'Test Metabox', '__return_false', 'post' );
-                
+
                 $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] );
         }
 
@@ -79 +85 @@
                 // Add a meta box to three different post types
                 add_meta_box( 'testbox1', 'Test Metabox', '__return_false', array( 'post', 'comment', 'attachment' ) );
 
-                $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] ); 
+                $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['post']['advanced']['default'] );
                 $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['comment']['advanced']['default'] );
                 $this->assertArrayHasKey( 'testbox1', $wp_meta_boxes['attachment']['advanced']['default'] );
         }
@@ -108 +114 @@
                 $this->assertFalse( $wp_meta_boxes['attachment']['advanced']['default']['testbox1'] );
         }
 
-}
- No newline at end of file
+}