Changeset 13462 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-trademarks.php

Timestamp:

04/05/2024 04:55:33 AM (15 months ago)

Author:

dd32

Message:

Plugin Directory: Expand the trademark checks to match multiple trademarks in the field checked.

Simplifies the error message and centralises the 3 uses of it.

See #5868.

File:

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

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

@@ -171 +171 @@
      * @param string $check                     The plugin name to check.
      * @param array|WP_User|WP_Post $exceptions An array of exceptions to the trademark checks, or a WP_User or WP_Post object to fetch their exceptions.
-     * @return string|false The trademarked slug if found, false otherwise.
+     * @return array|false The trademarked slug if found, false otherwise.
      */
     public static function check( $check, $exceptions = [] ) {
@@ -188 +188 @@
      * @param string                $plugin_slug The slug-like-text to check.
      * @param array|WP_User|WP_Post $exceptions  An array of exceptions to the trademark checks, or a WP_User or WP_Post object to fetch their exceptions.
-     * @return string|false The trademarked slug if found, false otherwise.
+     * @return array|false The trademarked slug if found, false otherwise.
      */
     public static function check_slug( $plugin_slug, $exceptions = [] ) {
@@ -220 +220 @@
         }
 
-        $has_trademarked_slug = false;
+        $has_trademarked_slug = [];
 
         foreach ( $trademarked_slugs as $trademark ) {
@@ -226 +226 @@
                 // Trademarks ending in "-" indicate slug cannot begin with that term.
                 if ( str_starts_with( $plugin_slug, $trademark ) ) {
-                    $has_trademarked_slug = $trademark;
-                    break;
+                    $has_trademarked_slug[] = $trademark;
                 }
 
@@ -246 +245 @@
 
                 // The term cannot exist anywhere in the plugin slug, and it's not a for-use exception.
-                $has_trademarked_slug = $trademark;
-                break;
+                $has_trademarked_slug[] = $trademark;
             }
         }
@@ -254 +252 @@
         foreach ( $portmanteaus as $portmanteau ) {
             if ( str_starts_with( $plugin_slug, $portmanteau ) ) {
-                $has_trademarked_slug = $portmanteau;
-                break;
+                $has_trademarked_slug[] = $portmanteau . '-'; // State that the portmanteau cannnot start the text.
             }
         }
 
-        return $has_trademarked_slug;
+        return array_unique( $has_trademarked_slug ) ?: false;
     }