Changeset 61090

Timestamp:

10/30/2025 04:01:56 PM (11 months ago)

Author:

SergeyBiryukov

Message:

Editor: Correct error message in WP_Block_Templates_Registry::unregister().

When attempting to unregister a non-existent block template, the error message will now include the template name.

Follow-up to [59073].

Props mukesh27, shailu25.
Fixes #64072.

Location:

trunk

Files:

• src/wp-includes/class-wp-block-templates-registry.php (modified) (2 diffs)
• tests/phpunit/tests/block-template.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-block-templates-registry.php

@@ -61 +61 @@
 
                 if ( $error_message ) {
-                        _doing_it_wrong(
-                                __METHOD__,
-                                $error_message,
-                                '6.7.0'
-                        );
+                        _doing_it_wrong( __METHOD__, $error_message, '6.7.0' );
+
                         return new WP_Error( $error_code, $error_message );
                 }
@@ -222 +219 @@
         public function unregister( $template_name ) {
                 if ( ! $this->is_registered( $template_name ) ) {
-                        _doing_it_wrong(
-                                __METHOD__,
-                                /* translators: %s: Template name. */
-                                sprintf( __( 'Template "%s" is not registered.' ), $template_name ),
-                                '6.7.0'
-                        );
                         /* translators: %s: Template name. */
-                        return new WP_Error( 'template_not_registered', __( 'Template "%s" is not registered.' ) );
+                        $error_message = sprintf( __( 'Template "%s" is not registered.' ), $template_name );
+
+                        _doing_it_wrong( __METHOD__, $error_message, '6.7.0' );
+
+                        return new WP_Error( 'template_not_registered', $error_message );
                 }
 

trunk/tests/phpunit/tests/block-template.php

@@ -480 +480 @@
 
         /**
+         * Tests that unregister_block_template() returns a WP_Error when trying to unregister
+         * a non-registered template, and that the error message includes the template name.
+         *
+         * @ticket 64072
+         *
+         * @covers ::unregister_block_template
+         */
+        public function test_unregister_block_template_error_message_includes_template_name() {
+                $template_name = 'test-plugin//unregistered-template';
+
+                // Ensure template is not registered.
+                unregister_block_template( $template_name );
+
+                // Expect _doing_it_wrong() notice.
+                $this->setExpectedIncorrectUsage( 'WP_Block_Templates_Registry::unregister' );
+
+                // Try to unregister again, should return WP_Error.
+                $error = unregister_block_template( $template_name );
+
+                $this->assertInstanceOf( 'WP_Error', $error );
+                $this->assertStringContainsString(
+                        $template_name,
+                        $error->get_error_message(),
+                        'Error message should include the template name.'
+                );
+        }
+
+        /**
          * Registers a test block to log `in_the_loop()` results.
          *