diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /inc/property.inc.php | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'inc/property.inc.php')
| -rw-r--r-- | inc/property.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/property.inc.php b/inc/property.inc.php index eae5033c..4a6c3720 100644 --- a/inc/property.inc.php +++ b/inc/property.inc.php @@ -100,7 +100,7 @@ class Property if (!isset($task['id'])) return 'Could not start list download (' . Message::asString() . ')'; if ($task['statusCode'] !== TASK_FINISHED) { - $task = Taskmanager::waitComplete($task['id'], 4000); + $task = Taskmanager::waitComplete($task['id'], 5000); } if ($task['statusCode'] !== TASK_FINISHED || !isset($task['data']['content'])) { return $task['data']['error']; |