Changeset 9806

Timestamp:

05/01/2020 06:25:16 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: Allow users to bypass the trademark checks if their registerd profile email matches the trademark owner.

Props Ipstenu.
Fixes #5178.

File:

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

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

@@ -461 +461 @@
         );
 
+        // Domains from which exceptions would be accepted.
+        $trademark_exceptions = array(
+            'yoast.com'      => array( 'yoast' ),
+            'automattic.com' => array( 'wordpress', 'woo', 'woocommerce' ),
+        );
+
         $has_trademarked_slug = false;
 
@@ -477 +483 @@
         }
 
+        // Get the user email domain.
+        $user_email_domain = explode( '@', wp_get_current_user()->user_email, 2 );
+
+        // If email domain is on our list of possible exceptions, we have an extra check.
+        if ( array_key_exists( $user_email_domain[1], $trademark_exceptions ) ) {
+            // If $has_trademarked_slug is in the array for that domain, they can use the term.
+            if ( in_array( $has_trademarked_slug, $trademark_exceptions[ $user_email_domain[1] ] ) ) {
+                $has_trademarked_slug = false;
+            }
+        }
+
         return $has_trademarked_slug;
     }