Merge "Make runLegacyHooks work around bug in Hooks." into Wikidata

diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index 28f9705..df0a180 100644 (file)
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -949,7 +949,9 @@ abstract class ContentHandler {
         * @return Boolean True if no handler aborted the hook
         */
        public static function runLegacyHooks( $event, $args = array(), $warn = true ) {
-               if ( !Hooks::isRegistered( $event ) ) {
+               global $wgHooks; //@todo: once I39bd5de2 is merged, direct access to $wgHooks is no longer needed.
+
+               if ( !Hooks::isRegistered( $event ) && empty( $wgHooks[$event] ) ) {
                        return true; // nothing to do here
                }