summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-06-17 17:21:44 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-06-17 17:21:44 +0000
commit4600df647f86a15d3bc26c3428d9f169141a2301 (patch)
treeb5fae77b5a40281f84fbd5a965010923f0a4e34e
parente3734f063ed58356f9653a81f6dea86aa55931f4 (diff)
downloadampache-4600df647f86a15d3bc26c3428d9f169141a2301.tar.gz
ampache-4600df647f86a15d3bc26c3428d9f169141a2301.tar.bz2
ampache-4600df647f86a15d3bc26c3428d9f169141a2301.zip
removed some debug and tweaked vainfo just a little bit more
-rwxr-xr-xmodules/id3/vainfo.class.php8
-rw-r--r--search.php1
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php
index 23f2703f..5cd6239c 100755
--- a/modules/id3/vainfo.class.php
+++ b/modules/id3/vainfo.class.php
@@ -120,13 +120,13 @@ class vainfo {
/* Switch on the file type */
switch ($this->type) {
case 'mp3':
- $this->_file_encoding = $this->_raw['encoding'];
- break;
+ case 'ogg':
+ case 'flac':
default:
- $this->_file_encoding = 'UTF-8';
+ $this->_file_encoding = $this->_raw['encoding'];
break;
} // end switch
-
+
} // _get_encoding
/**
diff --git a/search.php b/search.php
index 1d55a8ee..c1457910 100644
--- a/search.php
+++ b/search.php
@@ -51,7 +51,6 @@ switch ($action) {
}
case 'search':
show_template('show_search');
- print_r($_REQUEST);
$results = run_search($_REQUEST);
show_search($_REQUEST['object_type'],$results);
break;