summaryrefslogtreecommitdiffstats
path: root/modules-available/sysconfig/inc/configmodule
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available/sysconfig/inc/configmodule')
-rw-r--r--modules-available/sysconfig/inc/configmodule/branding.inc.php3
-rw-r--r--modules-available/sysconfig/inc/configmodule/customodule.inc.php3
-rw-r--r--modules-available/sysconfig/inc/configmodule/screensaver.inc.php4
3 files changed, 3 insertions, 7 deletions
diff --git a/modules-available/sysconfig/inc/configmodule/branding.inc.php b/modules-available/sysconfig/inc/configmodule/branding.inc.php
index 8990dbec..76968ff4 100644
--- a/modules-available/sysconfig/inc/configmodule/branding.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/branding.inc.php
@@ -22,13 +22,12 @@ class ConfigModule_Branding extends ConfigModule
if (!$this->validateConfig()) {
return $this->archive() !== false && file_exists($this->archive()); // No new temp file given, old archive still exists, pretend it worked...
}
- $task = Taskmanager::submit('MoveFile', array(
+ return Taskmanager::submit('MoveFile', array(
'source' => $this->tmpFile,
'destination' => $tgz,
'parentTask' => $parent,
'failOnParentFail' => false
));
- return $task;
}
protected function moduleVersion()
diff --git a/modules-available/sysconfig/inc/configmodule/customodule.inc.php b/modules-available/sysconfig/inc/configmodule/customodule.inc.php
index 8b968336..56aa9277 100644
--- a/modules-available/sysconfig/inc/configmodule/customodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/customodule.inc.php
@@ -34,13 +34,12 @@ class ConfigModule_CustomModule extends ConfigModule
// Nothing to do
return true;
}
- $task = Taskmanager::submit('MoveFile', array(
+ return Taskmanager::submit('MoveFile', array(
'source' => $this->tmpFile,
'destination' => $tgz,
'parentTask' => $parent,
'failOnParentFail' => false
));
- return $task;
}
protected function moduleVersion()
diff --git a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
index ed97941e..08a2c9a1 100644
--- a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
@@ -23,13 +23,11 @@ class ConfigModule_Screensaver extends ConfigModule
/* Give the Taskmanager the job and create the tgz */
$taskId = 'xscreensaver' . mt_rand() . '-' . microtime(true);
- $task = Taskmanager::submit('MakeTarball', array(
+ return Taskmanager::submit('MakeTarball', array(
'id' => $taskId,
'files' => $this->getFileArray(),
'destination' => $tgz,
), false);
-
- return $task;
}
protected function moduleVersion()