X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FHooks.php;h=785e71707c1a8625594e01a9cdd2d6b562047354;hb=102076134ff821a86e981b7e21c174b0b2889466;hp=396e360dd88456997275eb405aa3c9b0b2113d58;hpb=8fe0cf970401f2796ca39165a2d0a311b551c47a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 396e360dd8..785e71707c 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -124,6 +124,7 @@ class Hooks {
 	 *
 	 * @param string $event Event name
 	 * @param array $args  Array of parameters passed to hook functions
+	 * @param string|null $deprecatedVersion Optionally, mark hook as deprecated with version number
 	 * @return bool True if no handler aborted the hook
 	 *
 	 * @since 1.22 A hook function is not required to return a value for
@@ -132,7 +133,7 @@ class Hooks {
 	 * @throws MWException
 	 * @throws FatalError
 	 */
-	public static function run( $event, array $args = array() ) {
+	public static function run( $event, array $args = array(), $deprecatedVersion = null ) {
 		wfProfileIn( 'hook: ' . $event );
 		foreach ( self::getHandlers( $event ) as $hook ) {
 			// Turn non-array values into an array. (Can't use casting because of objects.)
@@ -195,10 +196,19 @@ class Hooks {
 			// Profile first in case the Profiler causes errors.
 			wfProfileIn( $func );
 			set_error_handler( 'Hooks::hookErrorHandler' );
+
+			// mark hook as deprecated, if deprecation version is specified
+			if ( $deprecatedVersion !== null ) {
+				wfDeprecated( "$event hook (used in $func)", $deprecatedVersion );
+			}
+
 			try {
 				$retval = call_user_func_array( $callback, $hook_args );
 			} catch ( MWHookException $e ) {
 				$badhookmsg = $e->getMessage();
+			} catch ( Exception $e ) {
+				restore_error_handler();
+				throw $e;
 			}
 			restore_error_handler();
 			wfProfileOut( $func );