Merge "Revert "Fix the web updater""

[lhc/web/wiklou.git] / includes / media / IPTC.php

diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 9e51b7d..b7ebfc9 100644 (file)
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -39,7 +39,7 @@ class IPTC {
         */
        static function parse( $rawData ) {
                $parsed = iptcparse( $rawData );
-               $data = array();
+               $data = [];
                if ( !is_array( $parsed ) ) {
                        return $data;
                }
@@ -52,7 +52,7 @@ class IPTC {
                                // Unknown charset. refuse to parse.
                                // note: There is a different between
                                // unknown and no charset specified.
-                               return array();
+                               return [];
                        }
                        unset( $parsed['1#090'] );
                }
@@ -81,7 +81,7 @@ class IPTC {
                                        if ( isset( $parsed['2#085'] ) ) {
                                                $titles = self::convIPTC( $parsed['2#085'], $c );
                                        } else {
-                                               $titles = array();
+                                               $titles = [];
                                        }
 
                                        $titleCount = count( $titles );
@@ -97,7 +97,7 @@ class IPTC {
                                case '2#025': /* keywords */
                                        $data['Keywords'] = self::convIPTC( $val, $c );
                                        break;
-                               case '2#101': /* Country (shown)*/
+                               case '2#101': /* Country (shown) */
                                        $data['CountryDest'] = self::convIPTC( $val, $c );
                                        break;
                                case '2#095': /* state/province (shown) */
@@ -115,7 +115,7 @@ class IPTC {
                                case '2#040': /* special instructions */
                                        $data['SpecialInstructions'] = self::convIPTC( $val, $c );
                                        break;
-                               case '2#105': /* headline*/
+                               case '2#105': /* headline */
                                        $data['Headline'] = self::convIPTC( $val, $c );
                                        break;
                                case '2#110': /* credit */
@@ -176,7 +176,7 @@ class IPTC {
                                                // if a version is set for the software.
                                                $softwareVersion = self::convIPTC( $parsed['2#070'], $c );
                                                unset( $parsed['2#070'] );
-                                               $data['Software'] = array( array( $software[0], $softwareVersion[0] ) );
+                                               $data['Software'] = [ [ $software[0], $softwareVersion[0] ] ];
                                        } else {
                                                $data['Software'] = $software;
                                        }
@@ -225,7 +225,7 @@ class IPTC {
                                        if ( isset( $parsed['2#060'] ) ) {
                                                $time = $parsed['2#060'];
                                        } else {
-                                               $time = array();
+                                               $time = [];
                                        }
                                        $timestamp = self::timeHelper( $val, $time, $c );
                                        if ( $timestamp ) {
@@ -239,7 +239,7 @@ class IPTC {
                                        if ( isset( $parsed['2#063'] ) ) {
                                                $time = $parsed['2#063'];
                                        } else {
-                                               $time = array();
+                                               $time = [];
                                        }
                                        $timestamp = self::timeHelper( $val, $time, $c );
                                        if ( $timestamp ) {
@@ -252,7 +252,7 @@ class IPTC {
                                        if ( isset( $parsed['2#035'] ) ) {
                                                $time = $parsed['2#035'];
                                        } else {
-                                               $time = array();
+                                               $time = [];
                                        }
                                        $timestamp = self::timeHelper( $val, $time, $c );
                                        if ( $timestamp ) {
@@ -265,7 +265,7 @@ class IPTC {
                                        if ( isset( $parsed['2#038'] ) ) {
                                                $time = $parsed['2#038'];
                                        } else {
-                                               $time = array();
+                                               $time = [];
                                        }
                                        $timestamp = self::timeHelper( $val, $time, $c );
                                        if ( $timestamp ) {