X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=aa282a793f769022df95db4bcd35b093cd11465c;hb=ca3ac3dfb89d2e801a65565dd8186ff250cde3df;hp=7b795068b8ec2eb7b272fd463eb369e3202f3b08;hpb=72bc1e8cf87ec368227fdae648ab7e5037a55bcf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7b795068b8..aa282a793f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -196,12 +196,6 @@ class OutputPage extends ContextSource {
 
 	// Parser related.
 
-	/**
-	 * @var int
-	 * @todo Unused?
-	 */
-	private $mContainsOldMagic = 0;
-
 	/** @var int */
 	protected $mContainsNewMagic = 0;
 
@@ -1379,7 +1373,8 @@ class OutputPage extends ContextSource {
 	}
 
 	/**
-	 * Add an array of indicators, with their identifiers as array keys and HTML contents as values.
+	 * Add an array of indicators, with their identifiers as array
+	 * keys and HTML contents as values.
 	 *
 	 * In case of duplicate keys, existing values are overwritten.
 	 *
@@ -1404,6 +1399,34 @@ class OutputPage extends ContextSource {
 		return $this->mIndicators;
 	}
 
+	/**
+	 * Adds help link with an icon via page indicators.
+	 * @param string $to
+	 * @param bool $overrideBaseUrl
+	 * @since 1.25
+	 */
+	public function addHelpLink( $to, $overrideBaseUrl = false ) {
+		$this->addModuleStyles( 'mediawiki.helplink' );
+		$text = $this->msg( 'helppage-top-gethelp' )->escaped();
+
+		if ( $overrideBaseUrl ) {
+			$helpUrl = $to;
+		} else {
+			$helpUrl = "//www.mediawiki.org/wiki/Special:MyLanguage/$to";
+		}
+		$link = Html::rawElement(
+			'a',
+			array(
+				'href' => $helpUrl,
+				'target' => '_blank',
+				'class' => 'mw-helplink',
+			),
+			$text
+		);
+
+		$this->setIndicators( array( 'mw-helplink' => $link ) );
+	}
+
 	/**
 	 * Do not allow scripts which can be modified by wiki users to load on this page;
 	 * only allow scripts bundled with, or generated by, the software.
@@ -1685,7 +1708,6 @@ class OutputPage extends ContextSource {
 	) {
 		global $wgParser;
 
-
 		$popts = $this->parserOptions();
 		$oldTidy = $popts->setTidy( $tidy );
 		$popts->setInterfaceMessage( (bool)$interface );
@@ -2171,7 +2193,6 @@ class OutputPage extends ContextSource {
 			return;
 		}
 
-
 		$response = $this->getRequest()->response();
 		$config = $this->getConfig();
 
@@ -2619,7 +2640,6 @@ class OutputPage extends ContextSource {
 	public function headElement( Skin $sk, $includeStyle = true ) {
 		global $wgContLang;
 
-
 		$userdir = $this->getLanguage()->getDir();
 		$sitedir = $wgContLang->getDir();
 
@@ -3287,6 +3307,13 @@ class OutputPage extends ContextSource {
 			'content' => "MediaWiki $wgVersion",
 		) );
 
+		if ( $config->get( 'ReferrerPolicy' ) !== false ) {
+			$tags['meta-referrer'] = Html::element( 'meta', array(
+				'name' => 'referrer',
+				'content' => $config->get( 'ReferrerPolicy' )
+			) );
+		}
+
 		$p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";
 		if ( $p !== 'index,follow' ) {
 			// http://www.robotstxt.org/wc/meta-user.html
@@ -3789,12 +3816,13 @@ class OutputPage extends ContextSource {
 	 * This function takes a number of message/argument specifications, wraps them in
 	 * some overall structure, and then parses the result and adds it to the output.
 	 *
-	 * In the $wrap, $1 is replaced with the first message, $2 with the second, and so
-	 * on. The subsequent arguments may either be strings, in which case they are the
-	 * message names, or arrays, in which case the first element is the message name,
-	 * and subsequent elements are the parameters to that message.
+	 * In the $wrap, $1 is replaced with the first message, $2 with the second,
+	 * and so on. The subsequent arguments may be either
+	 * 1) strings, in which case they are message names, or
+	 * 2) arrays, in which case, within each array, the first element is the message
+	 *    name, and subsequent elements are the parameters to that message.
 	 *
-	 * Don't use this for messages that are not in users interface language.
+	 * Don't use this for messages that are not in the user's interface language.
 	 *
 	 * For example:
 	 *
@@ -3805,7 +3833,7 @@ class OutputPage extends ContextSource {
 	 *    $wgOut->addWikiText( "<div class='error'>\n"
 	 *        . wfMessage( 'some-error' )->plain() . "\n</div>" );
 	 *
-	 * The newline after opening div is needed in some wikitext. See bug 19226.
+	 * The newline after the opening div is needed in some wikitext. See bug 19226.
 	 *
 	 * @param string $wrap
 	 */
@@ -3880,4 +3908,16 @@ class OutputPage extends ContextSource {
 	public function sectionEditLinksEnabled() {
 		return $this->mEnableSectionEditLinks;
 	}
+
+	/**
+	 * Add ResourceLoader module styles for OOUI and set up the PHP implementation of it for use with
+	 * MediaWiki and this OutputPage instance.
+	 *
+	 * @since 1.25
+	 */
+	public function enableOOUI() {
+		OOUI\Theme::setSingleton( new OOUI\MediaWikiTheme() );
+		OOUI\Element::setDefaultDir( $this->getLanguage()->getDir() );
+		$this->addModuleStyles( 'oojs-ui.styles' );
+	}
 }