makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[prep-release-3.2.2] Add 3.1.12 to build and fix display of download box

Browse source
This commit is contained in:
Marc Alexander 2018-01-07 16:59:14 +01:00
parent e4fc82bee5
commit 77b275181a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -4,7 +4,7 @@
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="3.2.2" /> <property name="newversion" value="3.2.2" />
<property name="prevversion" value="3.2.1" /> <property name="prevversion" value="3.2.1" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.2-RC1" /> <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1, 3.2.0-RC2, 3.2.0, 3.2.2-RC1" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" /> <property name="oldversions" value="${olderversions}, ${prevversion}" />

4
phpBB/phpbb/install/module/update_filesystem/task/diff_files.php
View file

@ -208,7 +208,7 @@ class diff_files extends task_base
foreach ($update_files as $type => $files) foreach ($update_files as $type => $files)
{ {
if (count($files) < 1) if (empty($files))
{ {
unset($update_files[$type]); unset($update_files[$type]);
} }
@ -226,7 +226,7 @@ class diff_files extends task_base
foreach ($update_files as $type => $files) foreach ($update_files as $type => $files)
{ {
if (count($files) < 1) if (empty($files))
{ {
unset($update_files[$type]); unset($update_files[$type]);
} }

7
phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php
View file

@ -86,7 +86,8 @@ class download_updated_files extends task_base
{ {
$file_update_info = $this->installer_config->get('update_files', array()); $file_update_info = $this->installer_config->get('update_files', array());
if (count($file_update_info) > 0) // Display download box only if the archive won't be empty
if (!empty($file_update_info) && !(isset($file_update_info['delete']) && count($file_update_info) == 1))
{ {
// Render download box // Render download box
$this->iohandler->add_download_link( $this->iohandler->add_download_link(
@ -101,12 +102,12 @@ class download_updated_files extends task_base
'update_recheck_files_submit' => array( 'update_recheck_files_submit' => array(
'label' => 'UPDATE_RECHECK_UPDATE_FILES', 'label' => 'UPDATE_RECHECK_UPDATE_FILES',
'type' => 'submit', 'type' => 'submit',
'is_secondary' => count($file_update_info) < 1, 'is_secondary' => empty($file_update_info),
), ),
'database_update_submit' => array( 'database_update_submit' => array(
'label' => 'UPDATE_CONTINUE_UPDATE_PROCESS', 'label' => 'UPDATE_CONTINUE_UPDATE_PROCESS',
'type' => 'submit', 'type' => 'submit',
'disabled' => count($file_update_info) > 0, 'disabled' => !empty($file_update_info),
), ),
)); ));