diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-05-14 07:12:15 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-05-14 07:12:15 +0000 |
| commit | 641e7de6373bcbf7ffb5ac3a8b737fb31f4f33c7 (patch) | |
| tree | 66d335c53b446971aeee36de7a2ba9e6504a302b /lib/general.lib.php | |
| parent | 779f4bf4e560d7f415ea51a96ed547831745a8dc (diff) | |
| download | ampache-641e7de6373bcbf7ffb5ac3a8b737fb31f4f33c7.tar.gz ampache-641e7de6373bcbf7ffb5ac3a8b737fb31f4f33c7.tar.bz2 ampache-641e7de6373bcbf7ffb5ac3a8b737fb31f4f33c7.zip | |
catalog build technically works now, still working out some issues with the dynamic updating of the current state
Diffstat (limited to 'lib/general.lib.php')
| -rw-r--r-- | lib/general.lib.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php index c9283f08..4ee9796f 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -190,7 +190,7 @@ function extend_session($sid) { function get_tag_type($results) { /* Pull In the config option */ - $order = conf('tag_order'); + $order = Config::get('tag_order'); if (!is_array($order)) { $order = array($order); @@ -236,12 +236,7 @@ function clean_tag_info($results,$key,$filename) { $info['title'] = stripslashes(trim($results[$key]['title'])); $info['year'] = intval($results[$key]['year']); $info['track'] = intval($results[$key]['track']); - $info['comment'] = sql_escape(str_replace($clean_array,$wipe_array,$results[$key]['comment'])); - - if (strlen($info['comment']) > 254) { - debug_event('catalog','Error: Comment over 254 Char, truncating',4); - $info['comment'] = substr($info['comment'],0,254); - } + $info['comment'] = Dba::escape(str_replace($clean_array,$wipe_array,$results[$key]['comment'])); /* This are pulled from the info array */ $info['bitrate'] = intval($results['info']['bitrate']); |