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

Timestamp:

06/28/2015 12:16:17 AM (11 years ago)

Author:

wonderboymusic

Message:

Update getID3 to 1.9.9

Changelog:

• ​https://github.com/JamesHeinrich/getID3/blob/master/changelog.txt
• ​https://github.com/JamesHeinrich/getID3/compare/v1.9.8...v1.9.9

Fixes #32806.

File:

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

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

@@ -102 +102 @@
 
                         if (!isset($info['ape'])) {
-                                $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);
-                                $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 (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);
+                                        $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 {
+                                        $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)';
+                                }
                         }