Changeset 13722

Timestamp:

05/17/2024 03:17:10 AM (7 months ago)

Author:

dd32

Message:

Plugin Directory: Blocks: Tweak the fallback name slightly, to skip the plugin slug if it's the namespace..

See [13718].
See #5971.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (1 diff)

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

@@ -850 +850 @@
                 // If the block duplicates the namespace, remove it. 'plugin-slug/plugin-slug-block-name'
                 $block->title = preg_replace( '#^([^/]+)/\\1-?#i', '$1/', $block->title );
+                // If the namespace is the slug (w/ or w/o dashes..), remove it.
+                if (
+                    str_starts_with( $block->title, $plugin_slug . '/' ) ||
+                    str_starts_with( $block->title, str_replace( '-', '', $plugin_slug ) . '/' )
+                ) {
+                    $block->title = explode( '/', $block->title, 2 )[1];
+                }
                 // Treat any non-wordy characters as spaces.
-                $block->title = preg_replace( '/[^a-z]+/', ' ', $block_name );
+                $block->title = preg_replace( '/[^a-z]+/', ' ', $block->title );
                 // Capitalise all words.
                 $block->title = ucwords( $block->title );