10 files changed, 56 insertions, 16 deletions
diff --git a/build/build.xml b/build/build.xml
index 615e420a13..165f522047 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,7 +2,7 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.2.0-RC3-dev" />
+	<property name="newversion" value="3.2.0" />
 	<property name="prevversion" value="3.2.0-RC2" />
 	<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.2.0-a1, 3.2.0-a2, 3.2.0-b1, 3.2.0-b2, 3.2.0-RC1" />
 	<!-- no configuration should be needed beyond this point -->
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index a6a5bf41cb..523f7adc53 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-@define('PHPBB_VERSION', '3.2.0-RC3-dev');
+@define('PHPBB_VERSION', '3.2.0');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php
index 9a46117fe6..7b2a00d7b9 100644
--- a/phpBB/install/convert/controller/convertor.php
+++ b/phpBB/install/convert/controller/convertor.php
@@ -253,11 +253,11 @@ class convertor
 	/**
 	 * Obtain convertor settings
 	 *
-	 * @param string	$convertor	Name of the convertor
+	 * @param string	$converter	Name of the convertor
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response|StreamedResponse
 	 */
-	public function settings($convertor)
+	public function settings($converter)
 	{
 		$this->setup_navigation('settings');
 
@@ -265,7 +265,7 @@ class convertor
 		require_once ($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext);
 
 		// Include convertor if available
-		$convertor_file_path = $this->phpbb_root_path . 'install/convertors/convert_' . $convertor . '.' . $this->php_ext;
+		$convertor_file_path = $this->phpbb_root_path . 'install/convertors/convert_' . $converter . '.' . $this->php_ext;
 		if (!file_exists($convertor_file_path))
 		{
 			if ($this->request->is_ajax())
@@ -313,8 +313,8 @@ class convertor
 			// It must be an AJAX request at this point
 			$response = new StreamedResponse();
 			$ref = $this;
-			$response->setCallback(function() use ($ref, $convertor) {
-				$ref->proccess_settings_form($convertor);
+			$response->setCallback(function() use ($ref, $converter) {
+				$ref->proccess_settings_form($converter);
 			});
 			$response->headers->set('X-Accel-Buffering', 'no');
 
@@ -324,7 +324,7 @@ class convertor
 		{
 			$this->template->assign_vars(array(
 				'U_ACTION'	=> $this->controller_helper->route('phpbb_convert_settings', array(
-					'convertor'	=> $convertor,
+					'converter'	=> $converter,
 				))
 			));
 
@@ -760,7 +760,7 @@ class convertor
 				'SOFTWARE'	=> $convertors[$index]['forum_name'],
 				'VERSION'	=> $convertors[$index]['version'],
 
-				'U_CONVERT'	=> $this->controller_helper->route('phpbb_convert_settings', array('convertor' => $convertors[$index]['tag'])),
+				'U_CONVERT'	=> $this->controller_helper->route('phpbb_convert_settings', array('converter' => $convertors[$index]['tag'])),
 			));
 		}
 
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index c7006f9758..73d4b6b1ff 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.2.0-RC3-dev',
+	'phpbb_version'	=> '3.2.0',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Limited</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index f5dfa83712..c67766e8a1 100755
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
 define('PHPBB_ENVIRONMENT', 'production');
-define('PHPBB_VERSION', '3.2.0-RC3-dev');
+define('PHPBB_VERSION', '3.2.0');
 $phpbb_root_path = __DIR__ . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 64397904e9..5a9e012701 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -278,7 +278,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-RC3-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 
diff --git a/phpBB/phpbb/db/migration/data/v320/v320.php b/phpBB/phpbb/db/migration/data/v320/v320.php
new file mode 100644
index 0000000000..20e741cb8b
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/v320.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v320;
+
+use phpbb\db\migration\migration;
+
+class v320 extends migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.2.0', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\increase_size_of_emotion',
+			'\phpbb\db\migration\data\v320\cookie_notice',
+		);
+
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.2.0')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
index 13c1591dcd..b66847b243 100644
--- a/phpBB/phpbb/install/module/update_database/task/update_extensions.php
+++ b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
@@ -138,7 +138,7 @@ class update_extensions extends task_base
 			$default_update_extensions = [];
 			foreach (self::$default_extensions_update as $version => $extensions)
 			{
-				if ($this->update_helper->phpbb_version_compare($version_from, $version, '<='))
+				if ($this->update_helper->phpbb_version_compare($version_from, $version, '<'))
 				{
 					$default_update_extensions = array_merge($default_update_extensions, $extensions);
 				}
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
index 5b48350e73..47a71eb844 100644
--- a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
+++ b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
@@ -123,7 +123,7 @@ class file_check extends task_base
 		$default_update_extensions = [];
 		foreach (\phpbb\install\module\update_database\task\update_extensions::$default_extensions_update as $version => $extensions)
 		{
-			if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>'))
+			if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>='))
 			{
 				$default_update_extensions = array_merge($default_update_extensions, $extensions);
 			}
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 6701ce5905..725282036b 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = prosilver
 copyright = © phpBB Limited, 2007
-style_version = 3.2.0-RC2
-phpbb_version = 3.2.0-RC2
+style_version = 3.2.0
+phpbb_version = 3.2.0
 
 # Defining a different template bitfield
 # template_bitfield = lNg=