diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:06:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-07 11:06:18 +0100 |
| commit | 4aab9e792ae05640611e1d613f4cd478c7f5439d (patch) | |
| tree | bb3b717794c0a886fc07519a38d96135c028f4e0 /phpBB/phpbb/install | |
| parent | Merge pull request #5076 from marc1706/ticket/15496 (diff) | |
| parent | [ticket/15353] Do not use empty to not offer empty archive for download (diff) | |
| download | phpbb-4aab9e792ae05640611e1d613f4cd478c7f5439d.tar.gz phpbb-4aab9e792ae05640611e1d613f4cd478c7f5439d.tar.bz2 phpbb-4aab9e792ae05640611e1d613f4cd478c7f5439d.zip | |
Merge pull request #5077 from marc1706/ticket/15353
[ticket/15353] Do not use empty to not offer empty archive for download
Diffstat (limited to 'phpBB/phpbb/install')
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/diff_files.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php index 2f6048b4fd..7114e60ba1 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php @@ -208,7 +208,7 @@ class diff_files extends task_base foreach ($update_files as $type => $files) { - if (empty($files)) + if (count($files) < 1) { unset($update_files[$type]); } @@ -226,7 +226,7 @@ class diff_files extends task_base foreach ($update_files as $type => $files) { - if (empty($files)) + if (count($files) < 1) { unset($update_files[$type]); } diff --git a/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php b/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php index 0b83e9a79d..2fc756c20a 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php @@ -101,12 +101,12 @@ class download_updated_files extends task_base 'update_recheck_files_submit' => array( 'label' => 'UPDATE_RECHECK_UPDATE_FILES', 'type' => 'submit', - 'is_secondary' => empty($file_update_info), + 'is_secondary' => count($file_update_info) < 1, ), 'database_update_submit' => array( 'label' => 'UPDATE_CONTINUE_UPDATE_PROCESS', 'type' => 'submit', - 'disabled' => !empty($file_update_info), + 'disabled' => count($file_update_info) > 0, ), )); |