X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;ds=sidebyside;f=includes%2Fcontent%2FJavaScriptContent.php;h=6d23656009188e095859494fcec8a37d7abf9571;hb=ba7287fce6d64b72916ae7fe3f3a31c5185347d2;hp=0991f07683e049a2369f20db5d7fe7a3b4904c3c;hpb=efb41a22049a05c9beb25df66edc5ec7087ee0ad;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/content/JavaScriptContent.php b/includes/content/JavaScriptContent.php
index 0991f07683..6d23656009 100644
--- a/includes/content/JavaScriptContent.php
+++ b/includes/content/JavaScriptContent.php
@@ -32,11 +32,17 @@
  */
 class JavaScriptContent extends TextContent {
 
+	/**
+	 * @var bool|Title|null
+	 */
+	private $redirectTarget = false;
+
 	/**
 	 * @param string $text JavaScript code.
+	 * @param string $modelId the content model name
 	 */
-	public function __construct( $text ) {
-		parent::__construct( $text, CONTENT_MODEL_JAVASCRIPT );
+	public function __construct( $text, $modelId = CONTENT_MODEL_JAVASCRIPT ) {
+		parent::__construct( $text, $modelId );
 	}
 
 	/**
@@ -72,4 +78,46 @@ class JavaScriptContent extends TextContent {
 		return $html;
 	}
 
+	/**
+	 * If this page is a redirect, return the content
+	 * if it should redirect to $target instead
+	 *
+	 * @param Title $target
+	 * @return JavaScriptContent
+	 */
+	public function updateRedirect( Title $target ) {
+		if ( !$this->isRedirect() ) {
+			return $this;
+		}
+
+		return $this->getContentHandler()->makeRedirectContent( $target );
+	}
+
+	/**
+	 * @return Title|null
+	 */
+	public function getRedirectTarget() {
+		if ( $this->redirectTarget !== false ) {
+			return $this->redirectTarget;
+		}
+		$this->redirectTarget = null;
+		$text = $this->getNativeData();
+		if ( strpos( $text, '/* #REDIRECT */' ) === 0 ) {
+			// Extract the title from the url
+			preg_match( '/title=(.*?)\\\\u0026action=raw/', $text, $matches );
+			if ( isset( $matches[1] ) ) {
+				$title = Title::newFromText( $matches[1] );
+				if ( $title ) {
+					// Have a title, check that the current content equals what
+					// the redirect content should be
+					if ( $this->equals( $this->getContentHandler()->makeRedirectContent( $title ) ) ) {
+						$this->redirectTarget = $title;
+					}
+				}
+			}
+		}
+
+		return $this->redirectTarget;
+	}
+
 }