mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-14 04:42:04 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2017-01-07 17:08:30 +01:00
commit 8d58d1814f
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
5 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.xml
View File

@ -3,8 +3,8 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build -->
<property name="newversion" value="3.3.0-a1-dev" />
<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" />
<property name="prevversion" value="3.2.0" />
<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, 3.2.0-RC2" />
<!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" />

14
phpBB/install/convert/controller/convertor.php
View File

@ -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'])),
));
}

40
phpBB/phpbb/db/migration/data/v320/v320.php Normal file
View File

@ -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')),
);
}
}

2
phpBB/phpbb/install/module/update_database/task/update_extensions.php
View File

@ -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);
}

2
phpBB/phpbb/install/module/update_filesystem/task/file_check.php
View File

@ -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);
}