Changeset 12469

Timestamp:

03/14/2023 07:30:35 AM (3 years ago)

Author:

dd32

Message:

HelpScout: Whitespace, explicit regex on the slug (Don't match HTML entities), fix the SQL matching to limit to the correct post_type.

Location:

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout

Files:

• common.php (modified) (1 diff)
• plugins-themes.php (modified) (3 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php

@@ -148 +148 @@
 
     $regexes = [
-        '!/([^/]+\.)?wordpress.org/(?<type>plugins|themes)/(?P<slug>[^/]+)/?!im',
+        '!/([^/]+\.)?wordpress.org/(?<type>plugins|themes)/(?P<slug>[a-z0-9-]+)/?!im',
         '!(?P<type>Plugin|Theme):\s*(?P<slug>[a-z0-9-]+)$!im',
-        '!(?P<type>plugins|themes)\.(trac|svn)\.wordpress\.org/(browser/)?(?P<slug>[^/]+)!im',
+        '!(?P<type>plugins|themes)\.(trac|svn)\.wordpress\.org/(browser/)?(?P<slug>[a-z0-9-]+)!im',
     ];
 

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.php

@@ -59 +59 @@
 
         display_items( $post_ids );
+
+        echo '<br/>';
     }
 
@@ -74 +76 @@
 
             display_items( $items );
+
+            echo '<br/>';
         }
 
@@ -116 +120 @@
             "SELECT ID
             FROM $wpdb->posts
-            WHERE post_type IN( 'plugin', 'repopackage' ) AND {$where}
+            WHERE post_type IN( 'plugin', 'repopackage' ) AND ( {$where} )
             ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' ), post_title",
         );