X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fcontent%2FJavaScriptContentHandler.php;h=65e3a6f0205858b5456e0e830a28ea59d7cf4634;hp=8d62e2a3ad12c93cd4af7d96182ae94a57dd5e58;hb=59ebff658ce912c1b0e7ef8d8f9bfec5a4e17b39;hpb=9d5d3b688da8788090adeebba3ecd3d771e2ccfe

diff --git a/includes/content/JavaScriptContentHandler.php b/includes/content/JavaScriptContentHandler.php
index 8d62e2a3ad..65e3a6f020 100644
--- a/includes/content/JavaScriptContentHandler.php
+++ b/includes/content/JavaScriptContentHandler.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Content handler for JavaScript pages.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -23,11 +21,12 @@
 /**
  * Content handler for JavaScript pages.
  *
+ * @todo Create a ScriptContentHandler base class, do highlighting stuff there?
+ *
  * @since 1.21
  * @ingroup Content
- * @todo make ScriptContentHandler base class, do highlighting stuff there?
  */
-class JavaScriptContentHandler extends TextContentHandler {
+class JavaScriptContentHandler extends CodeContentHandler {
 
 	/**
 	 * @param string $modelId
@@ -36,36 +35,28 @@ class JavaScriptContentHandler extends TextContentHandler {
 		parent::__construct( $modelId, array( CONTENT_FORMAT_JAVASCRIPT ) );
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getContentClass() {
 		return 'JavaScriptContent';
 	}
 
-	/**
-	 * Returns the english language, because JS is english, and should be handled as such.
-	 *
-	 * @param Title $title
-	 * @param Content $content
-	 *
-	 * @return Language Return of wfGetLangObj( 'en' )
-	 *
-	 * @see ContentHandler::getPageLanguage()
-	 */
-	public function getPageLanguage( Title $title, Content $content = null ) {
-		return wfGetLangObj( 'en' );
+	public function supportsRedirects() {
+		return true;
 	}
 
 	/**
-	 * Returns the english language, because JS is english, and should be handled as such.
+	 * Create a redirect that is also valid JavaScript
 	 *
-	 * @param Title $title
-	 * @param Content $content
-	 *
-	 * @return Language Return of wfGetLangObj( 'en' )
-	 *
-	 * @see ContentHandler::getPageViewLanguage()
+	 * @param Title $destination
+	 * @param string $text ignored
+	 * @return JavaScriptContent
 	 */
-	public function getPageViewLanguage( Title $title, Content $content = null ) {
-		return wfGetLangObj( 'en' );
+	public function makeRedirectContent( Title $destination, $text = '' ) {
+		// The parameters are passed as a string so the / is not url-encoded by wfArrayToCgi
+		$url = $destination->getFullURL( 'action=raw&ctype=text/javascript', false, PROTO_RELATIVE );
+		$class = $this->getContentClass();
+		return new $class( '/* #REDIRECT */' . Xml::encodeJsCall( 'mw.loader.load', array( $url ) ) );
 	}
-
 }