Changeset 62238 for trunk/src/wp-includes/abilities-api/class-wp-ability.php

Timestamp:

04/16/2026 07:22:23 AM (2 months ago)

Author:

gziolo

Message:

Abilities API: Catch exceptions thrown by ability callbacks and return WP_Error.

Wraps invoke_callback() in a try/catch so that exceptions thrown by execute or permission callbacks are converted to a WP_Error with the ability_callback_exception code instead of propagating as uncaught throwables.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/11544

Props priyankagusani, jamesgiroux, jeffpaul, dkotter, adamsilverstein, justlevine, jorbin, pavanpatil1.
Fixes #65058.

File:

• trunk/src/wp-includes/abilities-api/class-wp-ability.php (modified) (2 diffs)

trunk/src/wp-includes/abilities-api/class-wp-ability.php

@@ -503 +503 @@
      * @param callable $callback The callable to invoke.
      * @param mixed    $input    Optional. The input data for the ability. Default `null`.
-     * @return mixed The result of the callable execution.
+     * @return mixed The result of the callable execution, or a `WP_Error` if the callback threw.
      */
     protected function invoke_callback( callable $callback, $input = null ) {
@@ -511 +511 @@
         }
 
-        return $callback( ...$args );
+        try {
+            return $callback( ...$args );
+        } catch ( Throwable $e ) {
+            return new WP_Error(
+                'ability_callback_exception',
+                sprintf(
+                    /* translators: 1: Ability name, 2: Exception message. */
+                    __( 'Ability "%1$s" callback threw an exception: %2$s' ),
+                    esc_html( $this->name ),
+                    esc_html( $e->getMessage() )
+                )
+            );
+        }
     }