From: addshore <addshorewiki@gmail.com>
Date: Fri, 4 Dec 2015 20:45:30 +0000 (+0100)
Subject: Fix phpdoc of StatusValue::merge
X-Git-Tag: 1.31.0-rc.0~8806^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=b796300aa614e93d525c7ecd615a3109ba919601;p=lhc%2Fweb%2Fwiklou.git

Fix phpdoc of StatusValue::merge

Change-Id: I6fec36f9911d647fa7507c36b57f6b11ef04d63d
---

diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index 3c2dd4093d..35de084b5f 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -181,7 +181,7 @@ class StatusValue {
 	/**
 	 * Merge another status object into this one
 	 *
-	 * @param Status $other Other Status object
+	 * @param StatusValue $other Other StatusValue object
 	 * @param bool $overwriteValue Whether to override the "value" member
 	 */
 	public function merge( $other, $overwriteValue = false ) {