diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-02 21:15:17 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-02 21:15:17 +0100 |
| commit | 154c7500ea1852b1269d687c03bca4251c9c5bb0 (patch) | |
| tree | 0394fe9a938173df9a5755d8cb56ca3982081cf4 | |
| parent | b432f33b49e142cadc3643c4255192d4c10cc14c (diff) | |
| parent | debd1bb9d655106eb5454ac4687837c9323a99ae (diff) | |
| download | forums-154c7500ea1852b1269d687c03bca4251c9c5bb0.tar forums-154c7500ea1852b1269d687c03bca4251c9c5bb0.tar.gz forums-154c7500ea1852b1269d687c03bca4251c9c5bb0.tar.bz2 forums-154c7500ea1852b1269d687c03bca4251c9c5bb0.tar.xz forums-154c7500ea1852b1269d687c03bca4251c9c5bb0.zip | |
Merge pull request #4158 from CHItA/ticket/14321
[ticket/14321] Clean up arcihve controller logic
* CHItA/ticket/14321:
[ticket/14321] Clean up arcihve controller logic
| -rw-r--r-- | phpBB/phpbb/install/controller/archive_download.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/controller/archive_download.php b/phpBB/phpbb/install/controller/archive_download.php index a0f0ba181d..eabc0a9976 100644 --- a/phpBB/phpbb/install/controller/archive_download.php +++ b/phpBB/phpbb/install/controller/archive_download.php @@ -46,9 +46,9 @@ class archive_download */ public function conflict_archive() { - $filename = $this->installer_config->get('update_file_conflict_archive', false); + $filename = $this->installer_config->get('update_file_conflict_archive', ''); - if (!$filename) + if (empty($filename)) { throw new http_exception(404, 'URL_NOT_FOUND'); } @@ -65,7 +65,7 @@ class archive_download { $filename = $this->installer_config->get('update_file_archive', ''); - if (!$filename) + if (empty($filename)) { throw new http_exception(404, 'URL_NOT_FOUND'); } |