diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-06 05:17:55 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-06 05:17:55 +0000 |
| commit | 1c85db030e548e6bf7434e86070e4ba05917a325 (patch) | |
| tree | 283f8df9bc192144c13268213d206e31c92c2b29 /lib/class/catalog.class.php | |
| parent | 220625cedad4bc3a400d9bc0c0c6f0a103b7398f (diff) | |
| download | ampache-1c85db030e548e6bf7434e86070e4ba05917a325.tar.gz ampache-1c85db030e548e6bf7434e86070e4ba05917a325.tar.bz2 ampache-1c85db030e548e6bf7434e86070e4ba05917a325.zip | |
added in the ajax-loading div display on catalog processes, also relaxed the restrictions on filenames of non-site_charset, warning rather then fatal error
Diffstat (limited to 'lib/class/catalog.class.php')
| -rw-r--r-- | lib/class/catalog.class.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 311697cf..bde17ed9 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -504,7 +504,6 @@ class Catalog { if (strcmp($full_file,iconv(Config::get('site_charset'),Config::get('site_charset') . '//IGNORE',$full_file)) != '0') { debug_event('read',$full_file . ' has non-' . Config::get('site_charset') . ' characters and can not be indexed','1'); Error::add('catalog_add',$full_file . ' ' . _('does not match site charset')); - continue; } } // end if iconv @@ -1395,7 +1394,7 @@ class Catalog { $file = str_replace(array('(',')','\''),'',$results['file']); echo "<script type=\"text/javascript\">\n"; echo "update_txt('" . $count ."','clean_count_" . $this->id . "');"; - echo "update_txt('" . htmlentities($file) . "','clean_dir_" . $this->id . "');"; + echo "update_txt('" . addslashes(htmlentities($file)) . "','clean_dir_" . $this->id . "');"; echo "\n</script>\n"; flush(); } //echos song count |