aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-06 19:23:20 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-06 19:59:55 +0100
commit57179fbb7944e75a92e15cdbd5a9955bcc1677c7 (patch)
tree4f5417fbca253948202822531929a5989f68a25e /phpBB
parent39b142077478876b4c2ef270c081681070f264d7 (diff)
downloadforums-57179fbb7944e75a92e15cdbd5a9955bcc1677c7.tar
forums-57179fbb7944e75a92e15cdbd5a9955bcc1677c7.tar.gz
forums-57179fbb7944e75a92e15cdbd5a9955bcc1677c7.tar.bz2
forums-57179fbb7944e75a92e15cdbd5a9955bcc1677c7.tar.xz
forums-57179fbb7944e75a92e15cdbd5a9955bcc1677c7.zip
[ticket/15353] Do not use empty to not offer empty archive for download
PHPBB3-15353
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/install/module/update_filesystem/task/diff_files.php4
-rw-r--r--phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php4
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 8151a24f2d..b15e32cc82 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,
),
));