From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 10 Aug 2011 14:23:25 +0000 (+0000)
Subject: (bug 30074) Moving user JS subpages resulted in JS errors because #REDIRECT [[Foo... 
X-Git-Tag: 1.31.0-rc.0~28376
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=fe0d158186296837b5e09c6975af27ee891e559d;p=lhc%2Fweb%2Fwiklou.git

(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
---

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';