Ticket #16752: 16752-3.diff

wp-includes/taxonomy.php

@@ -866 +866 @@
         if ( $output == OBJECT ) {
                 return $_term;
         } elseif ( $output == ARRAY_A ) {
-                $__term = get_object_vars($_term);
-                return $__term;
+                return get_object_vars($_term);
         } elseif ( $output == ARRAY_N ) {
-                $__term = array_values(get_object_vars($_term));
-                return $__term;
+                return array_values(get_object_vars($_term));
         } else {
                 return $_term;
         }

wp-includes/post.php

@@ -403 +403 @@
         if ( $output == OBJECT ) {
                 return $_post;
         } elseif ( $output == ARRAY_A ) {
-                $__post = get_object_vars($_post);
-                return $__post;
+                return get_object_vars($_post);
         } elseif ( $output == ARRAY_N ) {
-                $__post = array_values(get_object_vars($_post));
-                return $__post;
+                return array_values(get_object_vars($_post));
         } else {
                 return $_post;
         }