X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Factions%2FAction.php;h=84bf16ee8fe346ac4ed8371745ab527808adac36;hb=2ab61690b27a6fa0f4b81909cdd0709d9de38dbe;hp=ead8efaebf3d19478083e2a9933c8992d48e9232;hpb=58cb1f824ac75c3b58ba19d1e88c1b38f9dc1fab;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/actions/Action.php b/includes/actions/Action.php
index ead8efaebf..84bf16ee8f 100644
--- a/includes/actions/Action.php
+++ b/includes/actions/Action.php
@@ -62,7 +62,7 @@ abstract class Action {
 	 * the action is disabled, or null if it's not recognised
 	 * @param string $action
 	 * @param array $overrides
-	 * @return bool|null|string|callable
+	 * @return bool|null|string|callable|Action
 	 */
 	final private static function getClass( $action, array $overrides ) {
 		global $wgActions;
@@ -96,6 +96,9 @@ abstract class Action {
 		$classOrCallable = self::getClass( $action, $page->getActionOverrides() );
 
 		if ( is_string( $classOrCallable ) ) {
+			if ( !class_exists( $classOrCallable ) ) {
+				return false;
+			}
 			$obj = new $classOrCallable( $page, $context );
 			return $obj;
 		}