summaryrefslogtreecommitdiffstats
path: root/lib/class/catalog.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-31 04:08:35 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-31 04:08:35 +0000
commit65bc8762b1dbcfd267555d11fc933418168110d5 (patch)
treece451b79d7a0cf0060e81d423aa7fbe56c40bcc8 /lib/class/catalog.class.php
parent748e50ade1b0c7034eddaadbe2285e5bf3a20fc6 (diff)
downloadampache-65bc8762b1dbcfd267555d11fc933418168110d5.tar.gz
ampache-65bc8762b1dbcfd267555d11fc933418168110d5.tar.bz2
ampache-65bc8762b1dbcfd267555d11fc933418168110d5.zip
fixed flag management interface, and potentially fixed an issue with use_auth=false
Diffstat (limited to 'lib/class/catalog.class.php')
-rw-r--r--lib/class/catalog.class.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index fffcb302..34747853 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1134,7 +1134,14 @@ class Catalog {
* updates the song info based on tags, this is called from a bunch of different places
* and passes in a full fledged song object, so it's a static function
*/
- public static function update_song_from_tags($song,$sort_pattern,$rename_pattern) {
+ public static function update_song_from_tags($song,$sort_pattern='',$rename_pattern='') {
+
+ // If the patterns aren't passed go look them up
+ if (!$sort_pattern OR !$rename_pattern) {
+ $catalog = new Catalog($song->catalog);
+ $sort_pattern = $catalog->sort_pattern;
+ $rename_pattern = $catalog->rename_pattern;
+ }
/* Record the reading of these tags */
debug_event('tag-read',"Reading Tags from $song->file",'5','ampache-catalog');