[pLog-svn] r4365 - plog/trunk/class/gallery/getid3

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-11-28 22:01:13 +0000 (Tue, 28 Nov 2006)
New Revision: 4365

Modified:
   plog/trunk/class/gallery/getid3/getid3.lib.php
   plog/trunk/class/gallery/getid3/getid3.php
Log:
The getid3 library depends on include_once a bit too much, so better set things as they were


Modified: plog/trunk/class/gallery/getid3/getid3.lib.php
===================================================================
--- plog/trunk/class/gallery/getid3/getid3.lib.php	2006-11-28 21:52:10 UTC (rev 4364)
+++ plog/trunk/class/gallery/getid3/getid3.lib.php	2006-11-28 22:01:13 UTC (rev 4365)
@@ -1302,7 +1302,7 @@
 		global $GETID3_ERRORARRAY;
 
 		if (file_exists($filename)) {
-			if (@lt_include($filename)) {
+			if (@include_once($filename)) {
 				return true;
 			} else {
 				$diemessage = basename($sourcefile).' depends on '.$filename.', which has errors';

Modified: plog/trunk/class/gallery/getid3/getid3.php
===================================================================
--- plog/trunk/class/gallery/getid3/getid3.php	2006-11-28 21:52:10 UTC (rev 4364)
+++ plog/trunk/class/gallery/getid3/getid3.php	2006-11-28 22:01:13 UTC (rev 4365)
@@ -98,7 +98,7 @@
 		}
 
 		// Load support library
-		if (!lt_include(GETID3_INCLUDEPATH.'getid3.lib.php')) {
+		if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
 			$this->startup_error .= 'getid3.lib.php is missing or corrupt';
 		}
 
@@ -273,7 +273,7 @@
 
 		// handle ID3v1 tag
 		if ($this->option_tag_id3v1) {
-			if (!@lt_include(GETID3_INCLUDEPATH.'module.tag.id3v1.php')) {
+			if (!@include_once(GETID3_INCLUDEPATH.'module.tag.id3v1.php')) {
 				return $this->error('module.tag.id3v1.php is missing - you may disable option_tag_id3v1.');
 			}
 			$tag = new getid3_id3v1($fp, $this->info);
@@ -281,7 +281,7 @@
 
 		// handle APE tag
 		if ($this->option_tag_apetag) {
-			if (!@lt_include(GETID3_INCLUDEPATH.'module.tag.apetag.php')) {
+			if (!@include_once(GETID3_INCLUDEPATH.'module.tag.apetag.php')) {
 				return $this->error('module.tag.apetag.php is missing - you may disable option_tag_apetag.');
 			}
 			$tag = new getid3_apetag($fp, $this->info);
@@ -289,7 +289,7 @@
 
 		// handle lyrics3 tag
 		if ($this->option_tag_lyrics3) {
-			if (!@lt_include(GETID3_INCLUDEPATH.'module.tag.lyrics3.php')) {
+			if (!@include_once(GETID3_INCLUDEPATH.'module.tag.lyrics3.php')) {
 				return $this->error('module.tag.lyrics3.php is missing - you may disable option_tag_lyrics3.');
 			}
 			$tag = new getid3_lyrics3($fp, $this->info);
@@ -343,7 +343,7 @@
 		}
 
 		// include module
-		lt_include(GETID3_INCLUDEPATH.$determined_format['include']);
+		include_once(GETID3_INCLUDEPATH.$determined_format['include']);
 
 		// instantiate module class
 		$class_name = 'getid3_'.$determined_format['module'];