Changeset 47601 for trunk/src/wp-includes/ID3/getid3.lib.php

Timestamp:

04/20/2020 11:11:48 AM (5 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3() to 1.9.19.

Changelog: ​https://github.com/JamesHeinrich/getID3/compare/v1.9.18...v1.9.19

Props ayeshrajans, schlessera.
See #49945.

File:

• trunk/src/wp-includes/ID3/getid3.lib.php (modified) (10 diffs)

trunk/src/wp-includes/ID3/getid3.lib.php

@@ -16 +16 @@
 {
     /**
-     * @param string $string
-     * @param bool   $hex
-     * @param bool   $spaces
-     * @param string $htmlencoding
+     * @param string      $string
+     * @param bool        $hex
+     * @param bool        $spaces
+     * @param string|bool $htmlencoding
      *
      * @return string
@@ -217 +217 @@
             default:
                 return false;
-                break;
         }
         if ($floatvalue >= 0) {
@@ -285 +284 @@
                 }
                 return $floatvalue;
-                break;
 
             default:
                 return false;
-                break;
         }
         $exponentstring = substr($bitword, 1, $exponentbits);
@@ -501 +498 @@
 
     /**
-     * @param array $array1
-     * @param array $array2
+     * @param mixed $array1
+     * @param mixed $array2
      *
      * @return array|false
@@ -524 +521 @@
 
     /**
-     * @param array $array1
-     * @param array $array2
+     * @param mixed $array1
+     * @param mixed $array2
      *
      * @return array|false
@@ -545 +542 @@
 
     /**
-     * @param array $array1
-     * @param array $array2
+     * @param mixed $array1
+     * @param mixed $array2
      *
      * @return array|false|null
@@ -736 +733 @@
 
     /**
-    * @param SimpleXMLElement|array $XMLobject
+    * @param SimpleXMLElement|array|mixed $XMLobject
     *
-    * @return array
+    * @return mixed
     */
     public static function SimpleXMLelement2array($XMLobject) {
@@ -1480 +1477 @@
      */
     public static function GetDataImageSize($imgData, &$imageinfo=array()) {
+        if (PHP_VERSION_ID >= 50400) {
+            $GetDataImageSize = @getimagesizefromstring($imgData, $imageinfo);
+            if ($GetDataImageSize === false || !isset($GetDataImageSize[0], $GetDataImageSize[1])) {
+                return false;
+            }
+            $GetDataImageSize['height'] = $GetDataImageSize[0];
+            $GetDataImageSize['width'] = $GetDataImageSize[1];
+            return $GetDataImageSize;
+        }
         static $tempdir = '';
         if (empty($tempdir)) {
@@ -1488 +1494 @@
             // yes this is ugly, feel free to suggest a better way
             if (include_once(dirname(__FILE__).'/getid3.php')) {
-                if ($getid3_temp = new getID3()) {
-                    if ($getid3_temp_tempdir = $getid3_temp->tempdir) {
-                        $tempdir = $getid3_temp_tempdir;
-                    }
-                    unset($getid3_temp, $getid3_temp_tempdir);
-                }
+                $getid3_temp = new getID3();
+                if ($getid3_temp_tempdir = $getid3_temp->tempdir) {
+                    $tempdir = $getid3_temp_tempdir;
+                }
+                unset($getid3_temp, $getid3_temp_tempdir);
             }
         }
@@ -1569 +1574 @@
                                     $ThisFileInfo['comments'][$tagname][$key] = $value;
                                 } else {
-                                    if (isset($ThisFileInfo['comments'][$tagname])) {
+                                    if (!isset($ThisFileInfo['comments'][$tagname])) {
                                         $ThisFileInfo['comments'][$tagname] = array($value);
                                     } else {