diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-06-15 18:24:25 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-06-15 18:24:25 +0000 |
| commit | c6c2320170b488f64f1c67de23a35f4ca4de59de (patch) | |
| tree | 961626970cbf6c709a15de8f703709cf8f0bf645 /modules | |
| parent | 7db599b70d03cc288fcf499bebd9afb2485c930d (diff) | |
| download | ampache-c6c2320170b488f64f1c67de23a35f4ca4de59de.tar.gz ampache-c6c2320170b488f64f1c67de23a35f4ca4de59de.tar.bz2 ampache-c6c2320170b488f64f1c67de23a35f4ca4de59de.zip | |
few catalog tweaks, removed dead files, added stats link and readme for kajax
Diffstat (limited to 'modules')
| -rwxr-xr-x | modules/id3/vainfo.class.php | 4 | ||||
| -rw-r--r-- | modules/kajax/README | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php index 92cdeb0c..d9efe341 100755 --- a/modules/id3/vainfo.class.php +++ b/modules/id3/vainfo.class.php @@ -381,8 +381,8 @@ class vainfo { function _clean_tag($tag,$encoding='') { - if ($this->_iconv AND $this->encoding != $encoding) { - $tag = iconv('UTF-8','ISO-8859-1',$tag); + if ($this->_iconv) { + $tag = iconv('UTF-8',conf('site_charset'),$tag); } return $tag; diff --git a/modules/kajax/README b/modules/kajax/README new file mode 100644 index 00000000..b945c5dd --- /dev/null +++ b/modules/kajax/README @@ -0,0 +1,24 @@ +/* + + Copyright (c) 2001 - 2006 Ampache.org + All rights reserved. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +/** + * Library Created by Kevin Riker + * Modified by Karl Vollmer + */ |