X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FEditPage.php;h=c0c0048db8ae6114c9d170d40aa11e0f8cde091a;hb=768b2de54f5c51c7b518891421db6708721fa525;hp=406673dee2371bc1e85f953b611def222267b0e0;hpb=32a1630ff2d6cda85d283df0cff3b0b805c67e27;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 406673dee2..c0c0048db8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3300,6 +3300,12 @@ HTML
 			'id' => $name,
 			'cols' => $wgUser->getIntOption( 'cols' ),
 			'rows' => $wgUser->getIntOption( 'rows' ),
+			// The following classes can be used here:
+			// * mw-editfont-default
+			// * mw-editfont-monospace
+			// * mw-editfont-sans-serif
+			// * mw-editfont-serif
+			'class' => 'mw-editfont-' . $wgUser->getOption( 'editfont' ),
 			// Avoid PHP notices when appending preferences
 			// (appending allows customAttribs['style'] to still work).
 			'style' => ''
@@ -3496,7 +3502,7 @@ HTML
 	 * @param string $format Output format, valid values are any function of a Message object
 	 * @return string
 	 */
-	public static function getCopyrightWarning( $title, $format = 'plain' ) {
+	public static function getCopyrightWarning( $title, $format = 'plain', $langcode = null ) {
 		global $wgRightsText;
 		if ( $wgRightsText ) {
 			$copywarnMsg = [ 'copyrightwarning',
@@ -3509,8 +3515,12 @@ HTML
 		// Allow for site and per-namespace customization of contribution/copyright notice.
 		Hooks::run( 'EditPageCopyrightWarning', [ $title, &$copywarnMsg ] );
 
+		$msg = call_user_func_array( 'wfMessage', $copywarnMsg )->title( $title );
+		if ( $langcode ) {
+			$msg->inLanguage( $langcode );
+		}
 		return "<div id=\"editpage-copywarn\">\n" .
-			call_user_func_array( 'wfMessage', $copywarnMsg )->title( $title )->$format() . "\n</div>";
+			$msg->$format() . "\n</div>";
 	}
 
 	/**
@@ -4145,7 +4155,7 @@ HTML
 			'name' => 'wpSave',
 			'tabindex' => ++$tabindex,
 		] + Linker::tooltipAndAccesskeyAttribs( 'save' );
-		$buttons['save'] = Html::submitButton( $buttonLabel, $attribs, [ 'mw-ui-constructive' ] );
+		$buttons['save'] = Html::submitButton( $buttonLabel, $attribs, [ 'mw-ui-progressive' ] );
 
 		++$tabindex; // use the same for preview and live preview
 		$attribs = [
@@ -4263,7 +4273,7 @@ HTML
 	protected function safeUnicodeOutput( $text ) {
 		return $this->checkUnicodeCompliantBrowser()
 			? $text
-			: $this->makesafe( $text );
+			: $this->makeSafe( $text );
 	}
 
 	/**