Changeset 47601 for trunk/src/wp-includes/ID3/getid3.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.php (modified) (8 diffs)

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

@@ -251 +251 @@
     protected $startup_warning = '';
 
-    const VERSION           = '1.9.18-201907240906';
+    const VERSION           = '1.9.19-201912131005';
     const FREAD_BUFFER_SIZE = 32768;
 
@@ -267 +267 @@
 
         // Check memory
-        $this->memory_limit = ini_get('memory_limit');
-        if (preg_match('#([0-9]+) ?M#i', $this->memory_limit, $matches)) {
+        $memoryLimit = ini_get('memory_limit');
+        if (preg_match('#([0-9]+) ?M#i', $memoryLimit, $matches)) {
             // could be stored as "16M" rather than 16777216 for example
-            $this->memory_limit = $matches[1] * 1048576;
-        } elseif (preg_match('#([0-9]+) ?G#i', $this->memory_limit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
+            $memoryLimit = $matches[1] * 1048576;
+        } elseif (preg_match('#([0-9]+) ?G#i', $memoryLimit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
             // could be stored as "2G" rather than 2147483648 for example
-            $this->memory_limit = $matches[1] * 1073741824;
-        }
+            $memoryLimit = $matches[1] * 1073741824;
+        }
+        $this->memory_limit = $memoryLimit;
+
         if ($this->memory_limit <= 0) {
             // memory limits probably disabled
@@ -288 +290 @@
         }
 
-        if (($mbstring_func_overload = ini_get('mbstring.func_overload')) && ($mbstring_func_overload & 0x02)) {
+        if (($mbstring_func_overload = (int) ini_get('mbstring.func_overload')) && ($mbstring_func_overload & 0x02)) {
             // http://php.net/manual/en/mbstring.overload.php
             // "mbstring.func_overload in php.ini is a positive value that represents a combination of bitmasks specifying the categories of functions to be overloaded. It should be set to 1 to overload the mail() function. 2 for string functions, 4 for regular expression functions"
@@ -295 +297 @@
         }
 
-        // WORDPRESS CHANGE FROM UPSTREAM
-        // Comment out deprecated function
-        /*
-        // Check for magic_quotes_runtime
-        if (function_exists('get_magic_quotes_runtime')) {
-            if (get_magic_quotes_runtime()) {
-                $this->startup_error .= 'magic_quotes_runtime must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_runtime(0) and set_magic_quotes_runtime(1).'."\n";
-            }
-        }
-
-        // Check for magic_quotes_gpc
-        if (function_exists('magic_quotes_gpc')) {
-            if (get_magic_quotes_gpc()) {
-                $this->startup_error .= 'magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).'."\n";
-            }
-        }
-        **/
+        // check for magic quotes in PHP < 7.4.0 (when these functions became deprecated)
+        if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+            // Check for magic_quotes_runtime
+            if (function_exists('get_magic_quotes_runtime')) {
+                if (get_magic_quotes_runtime()) {
+                    $this->startup_error .= 'magic_quotes_runtime must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_runtime(0) and set_magic_quotes_runtime(1).'."\n";
+                }
+            }
+            // Check for magic_quotes_gpc
+            if (function_exists('get_magic_quotes_gpc')) {
+                if (get_magic_quotes_gpc()) {
+                    $this->startup_error .= 'magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).'."\n";
+                }
+            }
+        }
 
         // Load support library
@@ -403 +403 @@
 
     /**
-     * @param string $filename
-     * @param int    $filesize
+     * @param string   $filename
+     * @param int      $filesize
+     * @param resource $fp
      *
      * @return bool
@@ -514 +515 @@
      * analyze file
      *
-     * @param string $filename
-     * @param int    $filesize
-     * @param string $original_filename
+     * @param string   $filename
+     * @param int      $filesize
+     * @param string   $original_filename
+     * @param resource $fp
      *
      * @return array
@@ -1105 +1107 @@
                             'module'    => 'ts',
                             'mime_type' => 'video/MP2T',
+                        ),
+
+                // WTV - audio/video - Windows Recorded TV Show
+                'wtv' => array(
+                            'pattern'   => '^\\xB7\\xD8\\x00\\x20\\x37\\x49\\xDA\\x11\\xA6\\x4E\\x00\\x07\\xE9\\x5E\\xAD\\x8D',
+                            'group'     => 'audio-video',
+                            'module'    => 'wtv',
+                            'mime_type' => 'video/x-ms-wtv',
                         ),
 
@@ -1529 +1539 @@
             default:
                 return $this->error('bad algorithm "'.$algorithm.'" in getHashdata()');
-                break;
         }