http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94155
Revision: 94155
Author: catrope
Date: 2011-08-10 14:23:25 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
(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
Modified Paths:
--------------
trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
Modified: trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
===================================================================
--- trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
2011-08-10 13:29:14 UTC (rev 94154)
+++ trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
2011-08-10 14:23:25 UTC (rev 94155)
@@ -91,7 +91,7 @@
continue;
}
$title = Title::newFromText( $titleText );
- if ( !$title ) {
+ if ( !$title || $title->isRedirect() ) {
continue;
}
$script = $this->getContent( $title );
@@ -119,7 +119,7 @@
continue;
}
$title = Title::newFromText( $titleText );
- if ( !$title ) {
+ if ( !$title || $title->isRedirect() ) {
continue;
}
$media = isset( $options['media'] ) ? $options['media']
: 'all';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
