Ticket #44416: 44416-simple.diff

src/wp-includes/class-wp-comment-query.php

@@ -635 +635 @@
                 $number = absint( $this->query_vars['number'] );
                 $offset = absint( $this->query_vars['offset'] );
                 $paged  = absint( $this->query_vars['paged'] );
+                $limits = '';
 
                 if ( ! empty( $number ) ) {
                         if ( $offset ) {
@@ -819 +820 @@
                         $this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
                 }
 
-                $join = '';
+                $join    = '';
+                $groupby = '';
 
                 if ( $join_posts_table ) {
                         $join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";

src/wp-includes/class-wp-xmlrpc-server.php

@@ -3700 +3700 @@
                 /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
                 do_action( 'xmlrpc_call', 'wp.editComment' );
 
+                $comment = array(
+                        'comment_ID' => $comment_ID,
+                );
+
                 if ( isset( $content_struct['status'] ) ) {
                         $statuses = get_comment_statuses();
                         $statuses = array_keys( $statuses );
@@ -3707 +3711 @@
                         if ( ! in_array( $content_struct['status'], $statuses ) ) {
                                 return new IXR_Error( 401, __( 'Invalid comment status.' ) );
                         }
-                        $comment_approved = $content_struct['status'];
+                        $comment['comment_approved'] = $content_struct['status'];
                 }
 
                 // Do some timestamp voodoo
                 if ( ! empty( $content_struct['date_created_gmt'] ) ) {
                         // We know this is supposed to be GMT, so we're going to slap that Z on there by force
-                        $dateCreated      = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-                        $comment_date     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
-                        $comment_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
+                        $dateCreated                 = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+                        $comment['comment_date']     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+                        $comment['comment_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
                 }
 
                 if ( isset( $content_struct['content'] ) ) {
-                        $comment_content = $content_struct['content'];
+                        $comment['comment_content'] = $content_struct['content'];
                 }
 
                 if ( isset( $content_struct['author'] ) ) {
-                        $comment_author = $content_struct['author'];
+                        $comment['comment_author'] = $content_struct['author'];
                 }
 
                 if ( isset( $content_struct['author_url'] ) ) {
-                        $comment_author_url = $content_struct['author_url'];
+                        $comment['comment_author_url'] = $content_struct['author_url'];
                 }
 
                 if ( isset( $content_struct['author_email'] ) ) {
-                        $comment_author_email = $content_struct['author_email'];
+                        $comment['comment_author_email'] = $content_struct['author_email'];
                 }
 
-                // We've got all the data -- post it:
-                $comment = compact( 'comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url' );
-
                 $result = wp_update_comment( $comment );
                 if ( is_wp_error( $result ) ) {
                         return new IXR_Error( 500, $result->get_error_message() );
@@ -5261 +5262 @@
                 // Only use a password if one was given.
                 if ( isset( $content_struct['wp_password'] ) ) {
                         $post_password = $content_struct['wp_password'];
+                } else {
+                        $post_password = '';
                 }
 
                 // Only set a post parent if one was provided.
                 if ( isset( $content_struct['wp_page_parent_id'] ) ) {
                         $post_parent = $content_struct['wp_page_parent_id'];
+                } else {
+                        $post_parent = 0;
                 }
 
                 // Only set the menu_order if it was provided.
                 if ( isset( $content_struct['wp_page_order'] ) ) {
                         $menu_order = $content_struct['wp_page_order'];
+                } else {
+                        $menu_order = 0;
                 }
 
                 $post_author = $user->ID;
@@ -5599 +5606 @@
 
                 $this->escape( $postdata );
 
-                $ID            = $postdata['ID'];
-                $post_content  = $postdata['post_content'];
-                $post_title    = $postdata['post_title'];
-                $post_excerpt  = $postdata['post_excerpt'];
-                $post_password = $postdata['post_password'];
-                $post_parent   = $postdata['post_parent'];
-                $post_type     = $postdata['post_type'];
-                $menu_order    = $postdata['menu_order'];
+                $ID             = $postdata['ID'];
+                $post_content   = $postdata['post_content'];
+                $post_title     = $postdata['post_title'];
+                $post_excerpt   = $postdata['post_excerpt'];
+                $post_password  = $postdata['post_password'];
+                $post_parent    = $postdata['post_parent'];
+                $post_type      = $postdata['post_type'];
+                $menu_order     = $postdata['menu_order'];
+                $ping_status    = $postdata['ping_status'];
+                $comment_status = $postdata['comment_status'];
 
                 // Let WordPress manage slug if none was provided.
                 $post_name = $postdata['post_name'];

src/wp-includes/comment.php

@@ -3094 +3094 @@
  */
 function wp_handle_comment_submission( $comment_data ) {
 
-        $comment_post_ID = $comment_parent = 0;
+        $comment_post_ID = $comment_parent = $user_ID = 0;
         $comment_author  = $comment_author_email = $comment_author_url = $comment_content = null;
 
         if ( isset( $comment_data['comment_post_ID'] ) ) {

src/wp-includes/post.php

@@ -3565 +3565 @@
                 $post_parent = 0;
         }
 
+        $new_postarr = array_merge(
+                array(
+                        'ID' => $post_ID,
+                ),
+                compact( array_diff( array_keys( $defaults ), array( 'context', 'filter' ) ) )
+        );
+
         /**
          * Filters the post parent -- used to check for and prevent hierarchy loops.
          *
@@ -3575 +3582 @@
          * @param array $new_postarr Array of parsed post data.
          * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
          */
-        $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
+        $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, $new_postarr, $postarr );
 
         /*
          * If the post is being untrashed and it has a desired slug stored in post meta,

tests/phpunit/tests/dependencies/scripts.php

@@ -866 +866 @@
          * @covers ::wp_enqueue_code_editor()
          */
         public function test_wp_enqueue_code_editor_when_generated_array_by_compact_will_be_passed() {
+                $file                   = '';
                 $wp_enqueue_code_editor = wp_enqueue_code_editor( compact( 'file' ) );
                 $this->assertNonEmptyMultidimensionalArray( $wp_enqueue_code_editor );