Merge "Provide backwards compatibility for RevisionInsertComplete hook."

[lhc/web/wiklou.git] / includes / registration / ExtensionRegistry.php

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index c91d6d6..c58b55e 100644 (file)
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -105,7 +105,7 @@ class ExtensionRegistry {
                                throw new Exception( "$path does not exist!" );
                        }
                        // @codeCoverageIgnoreStart
-                       if ( !$mtime ) {
+                       if ( $mtime === false ) {
                                $err = error_get_last();
                                throw new Exception( "Couldn't stat $path: {$err['message']}" );
                                // @codeCoverageIgnoreEnd
@@ -144,7 +144,7 @@ class ExtensionRegistry {
                        // been loaded
                        $cacheId = ObjectCache::detectLocalServerCache();
                        $cache = ObjectCache::newFromId( $cacheId );
-               } catch ( MWException $e ) {
+               } catch ( InvalidArgumentException $e ) {
                        $cache = new EmptyBagOStuff();
                }
                // See if this queue is in APC