Merge "Fix convIPTC docs"

diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 1d19791..666ce40 100644 (file)
--- 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 ) ) {