diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-20 05:41:47 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-20 05:41:47 +0000 |
| commit | fd51a754c4f7df3362e6da3e90d6dba7d96a2602 (patch) | |
| tree | 495666d24e0163afe359471fa02ecfb094d4fc6f | |
| parent | d22c6ea78f635f4486820a3c8e058b909c111475 (diff) | |
| download | ampache-fd51a754c4f7df3362e6da3e90d6dba7d96a2602.tar.gz ampache-fd51a754c4f7df3362e6da3e90d6dba7d96a2602.tar.bz2 ampache-fd51a754c4f7df3362e6da3e90d6dba7d96a2602.zip | |
sync from stable branch
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/class/catalog.class.php | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 17a4e6d6..4057bfcc 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.5-Alpha1 + - Added timeout override on update_single_item because the function + is a lie - Fix translations so it's not all german - Genre Tag is now used as a 'Tag', Browse Genre removed - Ignore getid3() iconv stuff doesn't seem to work diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index e9ecc100..7c7fe355 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1017,6 +1017,9 @@ class Catalog { */ public static function update_single_item($type,$id) { + // Because single items are large numbers of things too + set_time_limit(0); + $songs = array(); switch ($type) { |