1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-24 01:03:05 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-01-07 17:08:30 +01:00
5 changed files with 51 additions and 11 deletions

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

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

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