Ticket #49236: 49236.2.patch

src/wp-admin/includes/ajax-actions.php

@@ -1283 +1283 @@
                 $comment_author_email = wp_slash( $user->user_email );
                 $comment_author_url   = wp_slash( $user->user_url );
                 $comment_content      = trim( $_POST['content'] );
-                $comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : '';
+                $comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : 'comment';
 
                 if ( current_user_can( 'unfiltered_html' ) ) {
                         if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) {

src/wp-admin/includes/schema.php

@@ -111 +111 @@
         comment_karma int(11) NOT NULL default '0',
         comment_approved varchar(20) NOT NULL default '1',
         comment_agent varchar(255) NOT NULL default '',
-        comment_type varchar(20) NOT NULL default '',
+        comment_type varchar(20) NOT NULL default 'comment',
         comment_parent bigint(20) unsigned NOT NULL default '0',
         user_id bigint(20) unsigned NOT NULL default '0',
         PRIMARY KEY  (comment_ID),

src/wp-admin/includes/upgrade.php

@@ -283 +283 @@
                                 'comment_date'         => $now,
                                 'comment_date_gmt'     => $now_gmt,
                                 'comment_content'      => $first_comment,
+                                'comment_type'         => 'comment',
                         )
                 );
 
@@ -834 +835 @@
                 upgrade_530();
         }
 
+        if ( $wp_current_db_version < 47426 ) {
+                wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_update_comment_types_batch' );
+        }
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();

src/wp-content/themes/twentyten/functions.php

@@ -418 +418 @@
                 $GLOBALS['comment'] = $comment;
                 switch ( $comment->comment_type ) :
                         case '':
+                        case 'comment':
                                 ?>
                 <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
                 <div id="comment-<?php comment_ID(); ?>">

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

@@ -741 +741 @@
 
                                         case 'comment':
                                         case 'comments':
-                                                $comment_types[ $operator ][] = "''";
+                                                $comment_types[ $operator ][] = "'comment'";
                                                 break;
 
                                         case 'pings':

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

@@ -116 +116 @@
          * @since 4.4.0
          * @var string
          */
-        public $comment_type = '';
+        public $comment_type = 'comment';
 
         /**
          * Parent comment ID.

src/wp-includes/comment.php

@@ -1901 +1901 @@
         $comment_karma    = ! isset( $data['comment_karma'] ) ? 0 : $data['comment_karma'];
         $comment_approved = ! isset( $data['comment_approved'] ) ? 1 : $data['comment_approved'];
         $comment_agent    = ! isset( $data['comment_agent'] ) ? '' : $data['comment_agent'];
-        $comment_type     = ! isset( $data['comment_type'] ) ? '' : $data['comment_type'];
+        $comment_type     = ! isset( $data['comment_type'] ) ? 'comment' : $data['comment_type'];
         $comment_parent   = ! isset( $data['comment_parent'] ) ? 0 : $data['comment_parent'];
 
         $user_id = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
@@ -2057 +2057 @@
  *     @type string $comment_author_email The comment author email address.
  *     @type string $comment_author_url   The comment author URL.
  *     @type string $comment_content      The content of the comment.
+ *     @type string $comment_type         The name of the comment type.
  *     @type string $comment_date         The date the comment was submitted. Default is the current time.
  *     @type string $comment_date_gmt     The date the comment was submitted in the GMT timezone.
  *                                        Default is `$comment_date` in the GMT timezone.
@@ -2122 +2123 @@
                 $commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
         }
 
+        if ( empty( $commentdata['comment_type'] ) ) {
+                $commentdata['comment_type'] = 'comment';
+        }
+
         $commentdata = wp_filter_comment( $commentdata );
 
         $commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
@@ -3348 +3353 @@
                 }
         }
 
-        $comment_type = '';
+        $comment_type = 'comment';
 
         if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
                 if ( '' == $comment_author_email || '' == $comment_author ) {
@@ -3636 +3641 @@
 function wp_cache_set_comments_last_changed() {
         wp_cache_set( 'last_changed', microtime(), 'comment' );
 }
+
+/**
+ * Updates the comment type of a batch of comments.
+ *
+ * @since 5.5.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ */
+function _wp_batch_update_comment_types() {
+        global $wpdb;
+
+        $lock_name = 'update_comment_types.lock';
+
+        // Try to lock.
+        $lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
+
+        if ( ! $lock_result ) {
+                $lock_result = get_option( $lock_name );
+
+                // Bail if we were unable to create a lock, or if the existing lock is still valid.
+                if ( ! $lock_result || ( $lock_result > ( time() - HOUR_IN_SECONDS ) ) ) {
+                        wp_schedule_single_event( time() + ( 5 * MINUTE_IN_SECONDS ), 'wp_update_comment_types_batch' );
+                        return;
+                }
+        }
+
+        // Update the lock, as by this point we've definitely got a lock, just need to fire the actions.
+        update_option( $lock_name, time() );
+
+        // Check if there's still empty comment types.
+        $empty_comment_types = $wpdb->get_var(
+                "SELECT comment_ID FROM $wpdb->comments
+                WHERE comment_type = ''
+                LIMIT 1"
+        );
+
+        // No empty comment types, we're done here.
+        if ( ! $empty_comment_types ) {
+                update_option( 'finished_updating_comments_type', true );
+                delete_option( $lock_name );
+                return;
+        }
+
+        // Empty comment types found? We'll need to run this script again.
+        wp_schedule_single_event( time() + ( 2 * MINUTE_IN_SECONDS ), 'wp_update_comment_types_batch' );
+
+        // Update the `comment_type` field value to be `comment` for the next 100 rows about comments.
+        $wpdb->query(
+                "UPDATE {$wpdb->comments}
+                SET comment_type = 'comment'
+                WHERE comment_type = ''
+                ORDER BY comment_ID DESC
+                LIMIT 100"
+        );
+
+        delete_option( $lock_name );
+}
+
+/**
+ * In order to avoid the _wp_batch_update_comment_types() job being accidentally removed,
+ * check that it's still scheduled while we haven't finished updating comment types.
+ *
+ * @ignore
+ * @since 5.5.0
+ */
+function _wp_check_for_scheduled_update_comment_types() {
+        if ( ! get_option( 'finished_updating_comments_type' ) && ! wp_next_scheduled( 'wp_update_comment_types_batch' ) ) {
+                wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_update_comment_types_batch' );
+        }
+}

src/wp-includes/default-filters.php

@@ -450 +450 @@
 add_action( 'rest_api_init', 'create_initial_rest_routes', 99 );
 add_action( 'parse_request', 'rest_api_loaded' );
 
+// Comments comment type updates.
+add_action( 'admin_init', '_wp_check_for_scheduled_update_comment_types' );
+add_action( 'wp_update_comment_types_batch', '_wp_batch_update_comment_types' );
+
 /**
  * Filters formerly mixed into wp-includes.
  */

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -585 +585 @@
                         return $prepared_comment;
                 }
 
-                $prepared_comment['comment_type'] = '';
+                $prepared_comment['comment_type'] = 'comment';
 
                 /*
                  * Do not allow a comment to be created with missing or empty

src/wp-includes/version.php

@@ -20 +20 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 47018;
+$wp_db_version = 47426;
 
 /**
  * Holds the TinyMCE version.

tests/phpunit/tests/comment-submission.php

@@ -742 +742 @@
                                 'comment_author_email' => $user->user_email,
                                 'comment_author_url'   => $user->user_url,
                                 'comment_content'      => $data['comment'],
-                                'comment_type'         => '',
+                                'comment_type'         => 'comment',
                                 'comment_parent'       => '0',
                                 'user_ID'              => $user->ID,
                                 'user_id'              => $user->ID,