Changeset 44166 for trunk/src/wp-includes/class-wp-xmlrpc-server.php

Timestamp:

12/14/2018 05:12:12 AM (6 years ago)

Author:

desrosj

Message:

PHP7.3 compatibility: Fix compact throwing notices.

In PHP 7.3, the compact() function has been changed to issue an E_NOTICE level error if a passed string refers to an unset variable. In previous versions of PHP, this notice was silently skipped. The full RFC can be viewed here: ​https://wiki.php.net/rfc/compact.

Props jorbin, desrosj.

Merges [43819] and [43832] to trunk.

Fixes #44416.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-xmlrpc-server.php (modified) (7 diffs)

trunk/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'] ) ) {
@@ -3708 +3711 @@
                 return new IXR_Error( 401, __( 'Invalid comment status.' ) );
             }
-            $comment_approved = $content_struct['status'];
+
+            $comment['comment_approved'] = $content_struct['status'];
         }
 
@@ -3714 +3718 @@
         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'];
-        }
-
-        // 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' );
+            $comment['comment_author_email'] = $content_struct['author_email'];
+        }
 
         $result = wp_update_comment( $comment );
@@ -5262 +5263 @@
         if ( isset( $content_struct['wp_password'] ) ) {
             $post_password = $content_struct['wp_password'];
+        } else {
+            $post_password = '';
         }
 
@@ -5267 +5270 @@
         if ( isset( $content_struct['wp_page_parent_id'] ) ) {
             $post_parent = $content_struct['wp_page_parent_id'];
+        } else {
+            $post_parent = 0;
         }
 
@@ -5272 +5277 @@
         if ( isset( $content_struct['wp_page_order'] ) ) {
             $menu_order = $content_struct['wp_page_order'];
+        } else {
+            $menu_order = 0;
         }
 
@@ -5600 +5607 @@
         $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.