X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMessage.php;h=54efd261b656d6222a64e685298247c04060c8e4;hb=92a481e8a2650b0f68ef920f99c20398b9c649de;hp=ee41db009720b636c8337362dca12edd28d88698;hpb=7f9e12ee18e372a720aefbdca532c0770f959270;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Message.php b/includes/Message.php
index ee41db0097..54efd261b6 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -226,8 +226,9 @@ class Message implements MessageSpecifier, Serializable {
 	/**
 	 * @since 1.17
 	 *
-	 * @param string|string[] $key Message key or array of message keys to try and use the first
-	 * non-empty message for.
+	 * @param string|string[]|MessageSpecifier $key Message key, or array of
+	 * message keys to try and use the first non-empty message for, or a
+	 * MessageSpecifier to copy from.
 	 * @param array $params Message parameters.
 	 * @param Language $language Optional language of the message, defaults to $wgLang.
 	 *
@@ -236,6 +237,16 @@ class Message implements MessageSpecifier, Serializable {
 	public function __construct( $key, $params = array(), Language $language = null ) {
 		global $wgLang;
 
+		if ( $key instanceof MessageSpecifier ) {
+			if ( $params ) {
+				throw new InvalidArgumentException(
+					'$params must be empty if $key is a MessageSpecifier'
+				);
+			}
+			$params = $key->getParams();
+			$key = $key->getKey();
+		}
+
 		if ( !is_string( $key ) && !is_array( $key ) ) {
 			throw new InvalidArgumentException( '$key must be a string or an array' );
 		}
@@ -362,7 +373,7 @@ class Message implements MessageSpecifier, Serializable {
 	 *
 	 * @since 1.17
 	 *
-	 * @param string|string[] $key Message key or array of keys.
+	 * @param string|string[]|MessageSpecifier $key
 	 * @param mixed $param,... Parameters as strings.
 	 *
 	 * @return Message
@@ -429,7 +440,7 @@ class Message implements MessageSpecifier, Serializable {
 	 *
 	 * @since 1.17
 	 *
-	 * @param mixed $params,... Parameters as strings, or a single argument that is
+	 * @param mixed ... Parameters as strings, or a single argument that is
 	 * an array of strings.
 	 *
 	 * @return Message $this