From fe0d158186296837b5e09c6975af27ee891e559d Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Wed, 10 Aug 2011 14:23:25 +0000 Subject: [PATCH] (bug 30074) Moving user JS subpages resulted in JS errors because #REDIRECT [[Foo]] is invalid JS. Fix this by refusing to load redirect pages in ResourceLoaderWikiModule. Patch by John Du Hart --- includes/resourceloader/ResourceLoaderWikiModule.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php index d34548bb7b..9a75f9be12 100644 --- a/includes/resourceloader/ResourceLoaderWikiModule.php +++ b/includes/resourceloader/ResourceLoaderWikiModule.php @@ -91,7 +91,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule { continue; } $title = Title::newFromText( $titleText ); - if ( !$title ) { + if ( !$title || $title->isRedirect() ) { continue; } $script = $this->getContent( $title ); @@ -119,7 +119,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule { continue; } $title = Title::newFromText( $titleText ); - if ( !$title ) { + if ( !$title || $title->isRedirect() ) { continue; } $media = isset( $options['media'] ) ? $options['media'] : 'all'; -- 2.20.1