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

tanikawa-takumi · Jan 7, 2018 · 77b2751 · 77b2751
1 parent e4fc82b
commit 77b2751
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -4,7 +4,7 @@
 	<!-- a few settings for the build -->
 	<property name="newversion" value="3.2.2" />
 	<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 -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />

diff --git 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 @@ public function run()
 
 				foreach ($update_files as $type => $files)
 				{
-					if (count($files) < 1)
+					if (empty($files))
 					{
 						unset($update_files[$type]);
 					}
@@ -226,7 +226,7 @@ public function run()
 
 		foreach ($update_files as $type => $files)
 		{
-			if (count($files) < 1)
+			if (empty($files))
 			{
 				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
@@ -86,7 +86,8 @@ public function run()
 		{
 			$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
 				$this->iohandler->add_download_link(
@@ -101,12 +102,12 @@ public function run()
 				'update_recheck_files_submit'	=> array(
 					'label'			=> 'UPDATE_RECHECK_UPDATE_FILES',
 					'type'			=> 'submit',
-					'is_secondary'	=> count($file_update_info) < 1,
+					'is_secondary'	=> empty($file_update_info),
 				),
 				'database_update_submit'	=> array(
 					'label'		=> 'UPDATE_CONTINUE_UPDATE_PROCESS',
 					'type'		=> 'submit',
-					'disabled'	=> count($file_update_info) > 0,
+					'disabled'	=> !empty($file_update_info),
 				),
 			));