From: Reedy <reedy@wikimedia.org>
Date: Sat, 7 Apr 2012 19:23:53 +0000 (+0100)
Subject: Fix convIPTC docs
X-Git-Tag: 1.31.0-rc.0~23977^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=0cb14100b33ee6931ff578a44d3090acbd97dd04;p=lhc%2Fweb%2Fwiklou.git

Fix convIPTC docs

Change-Id: I3e20d7820d8880780dbda551416fc1cbc587db45
---

diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 1d19791cab..666ce40175 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -395,10 +395,10 @@ class IPTC {
 
 	/**
 	* Helper function to convert charset for iptc values.
-	* @param $data Mixed String or Array: The iptc string
+	* @param $data string|array The iptc string
 	* @param $charset String: The charset
 	 *
-	 * @return string
+	 * @return string|array
 	*/
 	private static function convIPTC ( $data, $charset ) {
 		if ( is_array( $data ) ) {