Ticket #10803: meta-default.patch

wp-includes/comment.php

@@ -414 +414 @@
  * @param int $comment_id Post ID.
  * @param string $key The meta key to retrieve.
  * @param bool $single Whether to return a single value.
- * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
- *  is true.
+ * @param mixed $default What to return when metadata doesn't exist.
+ * @return mixed Will be an array if $single is false and $default is not set.
+ *  Will be value of meta data field or $default if no metadata exist.
  */
-function get_comment_meta($comment_id, $key, $single = false) {
-        return get_metadata('comment', $comment_id, $key, $single);
+function get_comment_meta($comment_id, $key, $single = false, $default = false) {
+        if ( !$single && $default === false )
+                $default = array();
+
+        return get_metadata('comment', $comment_id, $key, $single, $default);
 }
 
 /**
@@ -885 +889 @@
 function wp_untrash_comment($comment_id = 0) {
         do_action('untrash_comment', $comment_id);
 
-        $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0');
+        $comment = array('comment_ID'=>$comment_id);
 
-        //Either set comment_approved to the value in comment_meta or worse case to false which will mean moderation
-        $comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+        //Either set comment_approved to the value in comment_meta or worse case to 0 which will mean moderation
+        $comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true, '0');
 
         wp_update_comment($comment);
 

wp-includes/meta.php

@@ -118 +118 @@
         return true;
 }
 
-function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
+function get_metadata($meta_type, $object_id, $meta_key = '', $single = false, $default = false) {
         if ( !$meta_type )
-                return false;
+                return $default;
 
         $meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
 
@@ -140 +140 @@
                 }
         }
 
-        if ($single)
-                return '';
-        else
-                return array();
+        return $default;
 }
 
 function update_meta_cache($meta_type, $object_ids) {

wp-includes/post.php

@@ -552 +552 @@
  * @param int $post_id Post ID.
  * @param string $key The meta key to retrieve.
  * @param bool $single Whether to return a single value.
- * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
- *  is true.
+ * @param mixed $default What to return when metadata doesn't exist.
+ * @return mixed Will be an array if $single is false and $default is not set.
+ *  Will be value of meta data field or $default if no metadata exist.
  */
-function get_post_meta($post_id, $key, $single = false) {
-        return get_metadata('post', $post_id, $key, $single);
+function get_post_meta($post_id, $key, $single = false, $default = false) {
+        if ( !$single && $default === false )
+                $default = array();
+
+        return get_metadata('post', $post_id, $key, $single, $default);
 }
 
 /**