diff options
| author | Simon Rettberg | 2015-01-26 20:28:49 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-01-26 20:28:49 +0100 |
| commit | 5347ecd5ddb1803ec1c43240bafc84f5c427f855 (patch) | |
| tree | 7a852cdaa44599dab5f4c98b9daa7c6443d81024 /inc/configmodule/branding.inc.php | |
| parent | Fix stupid bug in update query, check DB version before handling callbacks (diff) | |
| download | slx-admin-5347ecd5ddb1803ec1c43240bafc84f5c427f855.tar.gz slx-admin-5347ecd5ddb1803ec1c43240bafc84f5c427f855.tar.xz slx-admin-5347ecd5ddb1803ec1c43240bafc84f5c427f855.zip | |
Add configtgz class. Fix dozens of bugs
Diffstat (limited to 'inc/configmodule/branding.inc.php')
| -rw-r--r-- | inc/configmodule/branding.inc.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/inc/configmodule/branding.inc.php b/inc/configmodule/branding.inc.php index e8bd1da7..6e452a93 100644 --- a/inc/configmodule/branding.inc.php +++ b/inc/configmodule/branding.inc.php @@ -19,9 +19,7 @@ class ConfigModule_Branding extends ConfigModule protected function generateInternal($tgz, $parent) { if (!$this->validateConfig()) { - if ($this->archive() !== false && file_exists($this->archive())) - return true; // No new temp file given, old archive still exists, pretend it worked... - return false; + 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( 'source' => $this->tmpFile, @@ -44,7 +42,7 @@ class ConfigModule_Branding extends ConfigModule public function setData($key, $value) { - if ($key !== 'tmpFile' || !file_exists($value)) + if ($key !== 'tmpFile' || !is_string($value) || !file_exists($value)) return false; $this->tmpFile = $value; } |