Changeset 13460 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-upload.php

Timestamp:

04/05/2024 03:44:27 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Extract the trademark logic from the upload handler, into a generic class for use in the plugin directory.

See #5868, #6108.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-upload.php (modified) (3 diffs)

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

@@ -143 +143 @@
         // Duplicated from Upload handler.
         // Make sure it doesn't use a TRADEMARK protected slug.
-        if ( false !== $upload_handler->has_trademarked_slug()  ) {
+        $has_trademarked_slug = Trademarks::check_slug( $slug, wp_get_current_user() );
+        if ( $has_trademarked_slug ) {
             $error = __( 'That plugin slug includes a restricted term.', 'wporg-plugins' );
 
-            if ( $upload_handler->has_trademarked_slug() === trim( $upload_handler->has_trademarked_slug(), '-' ) ) {
+            if ( $has_trademarked_slug === trim( $has_trademarked_slug, '-' ) ) {
                 // Trademarks that do NOT end in "-" indicate slug cannot contain term at all.
                 $message = sprintf(
@@ -152 +153 @@
                     __( 'Your chosen plugin slug - %1$s - contains the restricted term "%2$s", which cannot be used at all in your plugin permalink nor the display name.', 'wporg-plugins' ),
                     '<code>' . $slug . '</code>',
-                    trim( $upload_handler->has_trademarked_slug(), '-' )
+                    '<code>' . trim( $has_trademarked_slug, '-' ) . '</code>'
                 );
             } else {
@@ -160 +161 @@
                     __( 'Your chosen plugin slug - %1$s - contains the restricted term "%2$s" and cannot be used to begin your permalink or display name. We disallow the use of certain terms in ways that are abused, or potentially infringe on and/or are misleading with regards to trademarks.', 'wporg-plugins' ),
                     '<code>' . $slug . '</code>',
-                    trim( $upload_handler->has_trademarked_slug(), '-' )
+                    '<code>' . trim( $has_trademarked_slug, '-' ) . '</code>'
                 );
             }