Changeset 10547

Timestamp:

12/29/2020 05:58:31 PM (5 years ago)

Author:

Ipstenu

Message:

Plugin Directory:

Add proper support for prohibited terms ending with a hyphen that have an exception, thank you.

Adding in some terms that are being abused.

Fixes #5560

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -447 +447 @@
             'fb-',
             'feedburner',
+            'gberg',
             'github-',
+            'givewp-',
             'google-',
             'googles-',
             'gravity-forms-',
             'gutenberg',
+            'guten-',
+            'hubspot-',
             'ig-',
             'instagram',
@@ -458 +462 @@
             'microsoft-',
             'ninja-forms-',
+            'oculus',
             'paypal-',
             'pinterest-',
@@ -468 +473 @@
             'watson',
             'windows-',
-            'wocommerce', 
+            'wocommerce',
             'woocommerce',  // technically ending with '-for-woocommerce' is allowed.
             'woo-commerce',
@@ -481 +486 @@
         $trademark_exceptions = array(
             'yoast.com'             => array( 'yoast' ),
-            'automattic.com'        => array( 'akismet', 'jetpack', 'wordpress', 'woo', 'woo-', 'woocommerce' ),
-            'facebook.com'          => array( 'facebook', 'whatsapp', 'instagram' ),
+            'automattic.com'        => array( 'akismet', 'akismet-', 'jetpack', 'jetpack-', 'wordpress', 'woo', 'woo-', 'woocommerce', 'woocommerce-' ),
+            'facebook.com'          => array( 'facebook', 'instagram', 'oculus', 'whatsapp' ),
             'support.microsoft.com' => array( 'bing-', 'microsoft-' ),
             'microsoft.com'         => array( 'bing-', 'microsoft-' ),