Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 44 insertions, 0 deletions

diff --git a/includes/content/CssContent.php b/includes/content/CssContent.php
index 8290603c..b4f5196d 100644
--- a/includes/content/CssContent.php
+++ b/includes/content/CssContent.php
@@ -33,6 +33,11 @@
 class CssContent extends TextContent {
 
 	/**
+	 * @var bool|Title|null
+	 */
+	private $redirectTarget = false;
+
+	/**
 	 * @param string $text CSS code.
 	 * @param string $modelId the content content model
 	 */
@@ -74,4 +79,43 @@ class CssContent extends TextContent {
 		return $html;
 	}
 
+	/**
+	 * @param Title $target
+	 * @return CssContent
+	 */
+	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=(.*?)&action=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;
+	}
+
 }