Changeset 30115

Timestamp:

10/30/2014 10:24:22 AM (12 years ago)

Author:

boonebgorges

Message:

Unserialize get_metadata() results when 'key' is omitted.

Props mattkeys, nacin.
Fixes #15030.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (1 diff)
• tests/phpunit/tests/meta.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -479 +479 @@
         }
 
-        if ( !$meta_key )
+        if ( ! $meta_key ) {
+                foreach ( $meta_cache as &$meta_values ) {
+                        $meta_values = array_map( 'maybe_unserialize', $meta_values );
+                }
+
                 return $meta_cache;
+        }
 
         if ( isset($meta_cache[$meta_key]) ) {

trunk/tests/phpunit/tests/meta.php

@@ -264 +264 @@
                 $this->assertFalse( delete_metadata_by_mid( 'user', array( 1 ) ) );
         }
+
+        /**
+         * @ticket 15030
+         */
+        public function test_get_metadata_with_empty_key_array_value_should_be_unserialized() {
+                $data = array( 1, 2 );
+                add_metadata( 'user', $this->author->ID, 'foo', $data );
+                $found = get_metadata( 'user', $this->author->ID );
+
+                $this->assertSame( array( $data ), $found['foo'] );
+        }
+
+        /**
+         * @ticket 15030
+         */
+        public function test_get_metadata_with_empty_key_object_value_should_be_unserialized() {
+                $data = new stdClass;
+                $data->foo = 'bar';
+                add_metadata( 'user', $this->author->ID, 'foo', $data );
+                $found = get_metadata( 'user', $this->author->ID );
+
+                $this->assertEquals( array( $data ), $found['foo'] );
+        }
+
+        /**
+         * @ticket 15030
+         */
+        public function test_get_metadata_with_empty_key_nested_array_value_should_be_unserialized() {
+                $data = array(
+                        array( 1, 2 ),
+                        array( 3, 4 ),
+                );
+                add_metadata( 'user', $this->author->ID, 'foo', $data );
+                $found = get_metadata( 'user', $this->author->ID );
+
+                $this->assertSame( array( $data ), $found['foo'] );
+        }
 }