Changeset 61289 for branches/6.9/src/wp-includes/ID3/module.tag.lyrics3.php

Timestamp:

11/24/2025 06:36:59 PM (11 months ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.24.

In [60812], two changes related to PHP 8.5 compatibility were cherry picked from the upstream repository to be included in time for WordPress 6.9. Since then, a proper release has been tagged which includes several bug fixes in addition to the previous two changes.

HEIF support has also been added to the Quicktime audio/video module.

A full list of changes can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.24

Reviewed by desrosj, SergeyBiryukov.
Merges [61253] to the 6.9 branch.

Props TobiasBg.
Fixes #64253.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/ID3/module.tag.lyrics3.php (modified) (5 diffs)

branches/6.9/src/wp-includes/ID3/module.tag.lyrics3.php

@@ -111 +111 @@
                                 if (isset($info['lyrics3']['tag_offset_start'])) {
                                         $GETID3_ERRORARRAY = &$info['warning'];
-                                        getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
-                                        $getid3_temp = new getID3();
-                                        $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
-                                        $getid3_apetag = new getid3_apetag($getid3_temp);
-                                        $getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
-                                        $getid3_apetag->Analyze();
-                                        if (!empty($getid3_temp->info['ape'])) {
-                                                $info['ape'] = $getid3_temp->info['ape'];
-                                        }
-                                        if (!empty($getid3_temp->info['replay_gain'])) {
-                                                $info['replay_gain'] = $getid3_temp->info['replay_gain'];
-                                        }
-                                        unset($getid3_temp, $getid3_apetag);
+                                        if ($this->getid3->option_tag_apetag) {
+                                                getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
+                                                $getid3_temp = new getID3();
+                                                $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+                                                $getid3_apetag = new getid3_apetag($getid3_temp);
+                                                $getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
+                                                $getid3_apetag->Analyze();
+                                                if (!empty($getid3_temp->info['ape'])) {
+                                                        $info['ape'] = $getid3_temp->info['ape'];
+                                                }
+                                                if (!empty($getid3_temp->info['replay_gain'])) {
+                                                        $info['replay_gain'] = $getid3_temp->info['replay_gain'];
+                                                }
+                                                unset($getid3_temp, $getid3_apetag);
+                                        } else {
+                                                $this->warning('Unable to check for Lyrics3 and APE tags interaction since option_tag_apetag=FALSE');
+                                        }
                                 } else {
                                         $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)');
@@ -228 +232 @@
                                                         if (strpos($imagestring, '||') !== false) {
                                                                 $imagearray = explode('||', $imagestring);
-                                                                $ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
+                                                                $ParsedLyrics3['images'][$key]['filename']     =                                $imagearray[0];
                                                                 $ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
                                                                 $ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
@@ -273 +277 @@
         public function Lyrics3Timestamp2Seconds($rawtimestamp) {
                 if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
-                        return (int) (($regs[1] * 60) + $regs[2]);
+                        return (int) (((int) $regs[1] * 60) + (int) $regs[2]);
                 }
                 return false;
@@ -288 +292 @@
                 foreach ($lyricsarray as $key => $lyricline) {
                         $regs = array();
-                        unset($thislinetimestamps);
+                        $thislinetimestamps = array();
                         while (preg_match('#^(\\[[0-9]{2}:[0-9]{2}\\])#', $lyricline, $regs)) {
                                 $thislinetimestamps[] = $this->Lyrics3Timestamp2Seconds($regs[0]);
@@ -294 +298 @@
                         }
                         $notimestamplyricsarray[$key] = $lyricline;
-                        if (isset($thislinetimestamps) && is_array($thislinetimestamps)) {
+                        if (count($thislinetimestamps) > 0) {
                                 sort($thislinetimestamps);
                                 foreach ($thislinetimestamps as $timestampkey => $timestamp) {
-                                        if (isset($Lyrics3data['synchedlyrics'][$timestamp])) {
+                                        if (isset($Lyrics3data['comments']['synchedlyrics'][$timestamp])) {
                                                 // timestamps only have a 1-second resolution, it's possible that multiple lines
                                                 // could have the same timestamp, if so, append
-                                                $Lyrics3data['synchedlyrics'][$timestamp] .= "\r\n".$lyricline;
+                                                $Lyrics3data['comments']['synchedlyrics'][$timestamp] .= "\r\n".$lyricline;
                                         } else {
-                                                $Lyrics3data['synchedlyrics'][$timestamp] = $lyricline;
-                                        }
-                                }
-                        }
-                }
-                $Lyrics3data['unsynchedlyrics'] = implode("\r\n", $notimestamplyricsarray);
-                if (isset($Lyrics3data['synchedlyrics']) && is_array($Lyrics3data['synchedlyrics'])) {
-                        ksort($Lyrics3data['synchedlyrics']);
+                                                $Lyrics3data['comments']['synchedlyrics'][$timestamp] = $lyricline;
+                                        }
+                                }
+                        }
+                }
+                $Lyrics3data['comments']['unsynchedlyrics'][0] = implode("\r\n", $notimestamplyricsarray);
+                if (isset($Lyrics3data['comments']['synchedlyrics']) && is_array($Lyrics3data['comments']['synchedlyrics'])) {
+                        ksort($Lyrics3data['comments']['synchedlyrics']);
                 }
                 return true;