From 4f1638a5a6f94d3040a1c7ea3307a366ff577b68 Mon Sep 17 00:00:00 2001 From: Happy-melon Date: Sat, 19 Mar 2011 21:19:50 +0000 Subject: [PATCH] Follow-up r81524: fix fatal when modules are deregistered --- includes/OutputPage.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 07700bbcb6..f57695be1b 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -361,7 +361,8 @@ class OutputPage { } /** - * Filter an array of modules to remove insufficiently trustworthy members + * Filter an array of modules to remove insufficiently trustworthy members, and modules + * which are no longer registered (eg a page is cached before an extension is disabled) * @param $modules Array * @return Array */ @@ -370,7 +371,9 @@ class OutputPage { $filteredModules = array(); foreach( $modules as $val ){ $module = $resourceLoader->getModule( $val ); - if( $module->getOrigin() <= $this->getAllowedModules( $type ) ) { + if( $module instanceof ResourceLoaderModule + && $module->getOrigin() <= $this->getAllowedModules( $type ) ) + { $filteredModules[] = $val; } } -- 2.20.1