Changeset 5335 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

Timestamp:

04/14/2017 09:34:12 PM (8 years ago)

Author:

coffee2code

Message:

Plugin Directory: Ensure replies to internal notes are assigned the proper comment_type when made outside of the edit plugin page.

Props SergeyBiryukov.
Fixes #2668.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -110 +110 @@
                 case 'post.php':
                     wp_enqueue_style( 'plugin-admin-post-css', plugins_url( 'css/edit-form.css', Plugin_Directory\PLUGIN_FILE ), array( 'edit' ), 4 );
-                    wp_enqueue_script( 'plugin-admin-post-js', plugins_url( 'js/edit-form.js', Plugin_Directory\PLUGIN_FILE ), array( 'wp-util', 'wp-lists' ), 2 );
+                    wp_enqueue_script( 'plugin-admin-post-js', plugins_url( 'js/edit-form.js', Plugin_Directory\PLUGIN_FILE ), array( 'wp-util', 'wp-lists' ), 3 );
                     wp_localize_script( 'plugin-admin-post-js', 'pluginDirectory', array(
                         'removeCommitterAYS' => __( 'Are you sure you want to remove this committer?', 'wporg-plugins' ),
@@ -509 +509 @@
                     $comment_auto_approved = true;
                 }
+            }
+        }
+
+        // Inherit comment type from parent comment.
+        if ( ! $comment_data['comment_type'] ) {
+            $parent = get_comment( $comment_parent );
+            if ( $parent && $parent->comment_post_ID == $comment_post_ID ) {
+                $comment_data['comment_type'] = $parent->comment_type;
             }
         }