fix for #172 that broke WavPack

#172
JamesHeinrich · Dec 5, 2018 · f31b896 · f31b896
1 parent aab2924
commit f31b896
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/getid3/getid3.php b/getid3/getid3.php
@@ -250,7 +250,7 @@ class getID3
 	 */
 	protected $startup_warning = '';
 
-	const VERSION           = '1.9.16-201812042150';
+	const VERSION           = '1.9.16-201812050141';
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
@@ -434,7 +434,7 @@ public function openfile($filename, $filesize=null, $fp=null) {
 			//if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) { // see https://www.getid3.org/phpBB3/viewtopic.php?t=1720
 			if (($fp != null) && ((get_resource_type($fp) == 'file') || (get_resource_type($fp) == 'stream'))) {
 				$this->fp = $fp;
-			} else if ((is_readable($filename) || file_exists($filename)) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
+			} elseif ((is_readable($filename) || file_exists($filename)) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
 				// great
 			} else {
 				$errormessagelist = array();

diff --git a/getid3/module.audio-video.riff.php b/getid3/module.audio-video.riff.php
@@ -1811,7 +1811,7 @@ public function ParseRIFFdata(&$RIFFdata) {
 			fclose($fp_temp);
 
 			$getid3_temp = new getID3();
-			$getid3_temp->openfile($tempfile, null, $this->getid3->fp);
+			$getid3_temp->openfile($tempfile);
 			$getid3_temp->info['filesize']     = $RIFFdataLength;
 			$getid3_temp->info['filenamepath'] = $info['filenamepath'];
 			$getid3_temp->info['tags']         = $info['tags'];