Merge branch '3.2.x'

dennisenderink · Jan 7, 2017 · 14ddadf · 14ddadf
2 parents c9905fc + 407e9e4
commit 14ddadf
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/install/convert/controller/convertor.php b/install/convert/controller/convertor.php
@@ -253,19 +253,19 @@ public function intro($start_new)
 	/**
 	 * 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');
 
 		require_once ($this->phpbb_root_path . 'includes/constants.' . $this->php_ext);
 		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 @@ public function settings($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 @@ public function settings($convertor)
 		{
 			$this->template->assign_vars(array(
 				'U_ACTION'	=> $this->controller_helper->route('phpbb_convert_settings', array(
-					'convertor'	=> $convertor,
+					'converter'	=> $converter,
 				))
 			));
 
@@ -760,7 +760,7 @@ protected function render_convert_list()
 				'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/db/migration/data/v320/v320.php b/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/install/module/update_database/task/update_extensions.php b/phpbb/install/module/update_database/task/update_extensions.php
@@ -138,7 +138,7 @@ public function run()
 			$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/install/module/update_filesystem/task/file_check.php b/phpbb/install/module/update_filesystem/task/file_check.php
@@ -123,7 +123,7 @@ function ($filename) use ($root_path)
 		$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);
 			}