Ticket #5560: 5560.diff

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

@@ -446 +446 @@
                         'facebook',
                         'fb-',
                         'feedburner',
+                        'gberg',
                         'github-',
+                        'givewp-',
                         'google-',
                         'googles-',
                         'gravity-forms-',
                         'gutenberg',
+                        'guten-',
+                        'hubspot-',
                         'ig-',
                         'instagram',
                         'jetpack-',
@@ -457 +461 @@
                         'macintosh-',
                         'microsoft-',
                         'ninja-forms-',
+                        'oculus',
                         'paypal-',
                         'pinterest-',
                         'stripe-',
@@ -467 +472 @@
                         'whats-app',
                         'watson',
                         'windows-',
-                        'wocommerce', 
+                        'wocommerce',
                         'woocommerce',  // technically ending with '-for-woocommerce' is allowed.
                         'woo-commerce',
                         'woo-',
@@ -480 +485 @@
                 // Domains from which exceptions would be accepted.
                 $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-' ),
                 );