Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024

1 files changed, 27 insertions, 4 deletions

diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 1d19791c..8fd3552f 100644
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -1,8 +1,31 @@
 <?php
 /**
-*Class for some IPTC functions.
+ * Class for some IPTC functions.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Media
+ */
 
-*/
+/**
+ * Class for some IPTC functions.
+ *
+ * @ingroup Media
+ */
 class IPTC {
 
 	/**
@@ -395,10 +418,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 ) ) {