Changeset 12755

Timestamp:

07/24/2023 04:18:02 AM (20 months ago)

Author:

dd32

Message:

Plugin Directory: HelpScout integration: When viewing a rejected plugin, search for both plugins with the non-suffixed/prefixed slug but also with the prefixes.

See r12611, r12754.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-helpscout.php (modified) (1 diff)

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

@@ -19 +19 @@
 
         // Trim off the rejected prefix/suffix.
-        $slug   = preg_replace( '/(^rejected-|-rejected$)/i', '', $post->post_name );
+        $slug   = preg_replace( '/(^rejected-|-rejected(-\d)?$)/i', '', $post->post_name );
         $emails = $wpdb->get_results( $wpdb->prepare(
             "SELECT emails.*
                 FROM %i emails
                     JOIN %i meta ON emails.id = meta.helpscout_id
-                WHERE meta.meta_key = 'plugins' AND meta.meta_value = %s
+                WHERE meta.meta_key = 'plugins' AND meta.meta_value IN( %s, %s )
                 ORDER BY `created` DESC",
             "{$wpdb->base_prefix}helpscout",
             "{$wpdb->base_prefix}helpscout_meta",
-            $slug
+            $slug,
+            $post->post_name
         ) );