Changeset 41196 for trunk/src/wp-includes/ID3/module.tag.lyrics3.php

Timestamp:

07/31/2017 07:49:31 PM (9 years ago)

Author:

wonderboymusic

Message:

Media: update the getID3 library to version 1.9.14 to avoid fatal errors in PHP7.

Props MyThemeShop for the initial patch.
Fixes #41496.

File:

• trunk/src/wp-includes/ID3/module.tag.lyrics3.php (modified) (11 diffs)

trunk/src/wp-includes/ID3/module.tag.lyrics3.php

@@ -25 +25 @@
 
         if (!getid3_lib::intValueSupported($info['filesize'])) {
-            $info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+            $this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
             return false;
         }
@@ -81 +81 @@
                     $info['avdataend'] = $lyrics3offset;
                     $lyrics3version = 1;
-                    $info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
+                    $this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
 
                 } elseif ($lyrics3end == 'LYRICS200') {
@@ -89 +89 @@
                     $lyrics3offset  = $info['ape']['tag_offset_start'] - $lyrics3size;
                     $lyrics3version = 2;
-                    $info['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
+                    $this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
 
                 }
@@ -118 +118 @@
                     unset($getid3_temp, $getid3_apetag);
                 } else {
-                    $info['warning'][] = 'Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)';
+                    $this->warning('Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)');
                 }
             }
@@ -133 +133 @@
 
         if (!getid3_lib::intValueSupported($endoffset)) {
-            $info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+            $this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
             return false;
         }
@@ -151 +151 @@
             if (strpos($rawdata, 'LYRICSBEGIN') !== false) {
 
-                $info['warning'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version;
+                $this->warning('"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version);
                 $info['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
                 $rawdata = substr($rawdata, strpos($rawdata, 'LYRICSBEGIN'));
@@ -160 +160 @@
             } else {
 
-                $info['error'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead';
+                $this->error('"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead');
                 return false;
 
@@ -174 +174 @@
                     $this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
                 } else {
-                    $info['error'][] = '"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
+                    $this->error('"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
                     return false;
                 }
@@ -222 +222 @@
                     }
                 } else {
-                    $info['error'][] = '"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
+                    $this->error('"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
                     return false;
                 }
@@ -228 +228 @@
 
             default:
-                $info['error'][] = 'Cannot process Lyrics3 version '.$version.' (only v1 and v2)';
+                $this->error('Cannot process Lyrics3 version '.$version.' (only v1 and v2)');
                 return false;
                 break;
@@ -235 +235 @@
 
         if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] <= $ParsedLyrics3['tag_offset_end'])) {
-            $info['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data';
+            $this->warning('ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data');
             unset($info['id3v1']);
             foreach ($info['warning'] as $key => $value) {