mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-24 17:40:43 +01:00
Merge branch '3.2.x'
This commit is contained in:
Marc Alexander
commit
f3338b2874
@ -50,6 +50,7 @@
|
||||
<ol>
|
||||
<li><a href="#changelog">Changelog</a>
|
||||
<ul>
|
||||
<li><a href="#v322">Changes since 3.2.2</a></li>
|
||||
<li><a href="#v321">Changes since 3.2.1</a></li>
|
||||
<li><a href="#v320">Changes since 3.2.0</a></li>
|
||||
<li><a href="#v320rc1">Changes since 3.2.0-RC1</a></li>
|
||||
@ -128,6 +129,62 @@
|
||||
<div class="inner">
|
||||
|
||||
<div class="content">
|
||||
<a name="v322"></a><h3>Changes since 3.2.2</h3>
|
||||
<h4>Bug</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14936">PHPBB3-14936</a>] - Missing language variable INST_ERR_DB</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15491">PHPBB3-15491</a>] - Outdated linkes in installer support page</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15492">PHPBB3-15492</a>] - Permissions role combobox does not work in RTL</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15500">PHPBB3-15500</a>] - Docs outdated for new PHP 5.4.7 requirement</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15502">PHPBB3-15502</a>] - Errors in migrations in 3.2.2 release</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15506">PHPBB3-15506</a>] - Previewing new post empties attachment list of all but first attachment</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15512">PHPBB3-15512</a>] - Avoid reparsing non-existent polls</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15513">PHPBB3-15513</a>] - Signature edit in acp gives error</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15520">PHPBB3-15520</a>] - DbDriver->sql_build_query cant cope with sub-selects</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15522">PHPBB3-15522</a>] - Allow multiple color palettes per page</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15523">PHPBB3-15523</a>] - AdBlocker may cause JS error when using CookieConsent</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15525">PHPBB3-15525</a>] - composer.json License is Invalid/Deprecated</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15526">PHPBB3-15526</a>] - Cast bbcode ID to integer</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15527">PHPBB3-15527</a>] - Cannot interpret the BBCode definition</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15532">PHPBB3-15532</a>] - Update pull request template</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15533">PHPBB3-15533</a>] - Typo in viewtopic_topic_tools.html</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15558">PHPBB3-15558</a>] - phpbb\report\report_handler_post.php</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15559">PHPBB3-15559</a>] - phpbb\report\report_handler_pm.php:56</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15595">PHPBB3-15595</a>] - Migration Module Exists Tool Broken</li>
|
||||
</ul>
|
||||
<h4>Improvement</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12579">PHPBB3-12579</a>] - Add BUTTON_ language strings for post & PM buttons</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15495">PHPBB3-15495</a>] - Use transactions for queries in move_forum</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15499">PHPBB3-15499</a>] - Drop HHVM support</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15510">PHPBB3-15510</a>] - Link Orphan attachments in ACP>General to Orphaned attachments page </li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15514">PHPBB3-15514</a>] - Improve accessibility by adding vital info from explanation to a title</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15518">PHPBB3-15518</a>] - Do not attempt to accurately determine whether posters can read private messages in viewtopic</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15528">PHPBB3-15528</a>] - Display the version of the installed styles in acp</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15529">PHPBB3-15529</a>] - Color groups in ACP</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15531">PHPBB3-15531</a>] - Log malformed BBCodes</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15534">PHPBB3-15534</a>] - Outdated ACP extensions database link for phpBB 3.2</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15535">PHPBB3-15535</a>] - Add S_FIRST_POST to postrow on viewtopic</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15537">PHPBB3-15537</a>] - Add events core.search_(native|mysql|postgres|sphinx)_index_before</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15547">PHPBB3-15547</a>] - Add file object to event core.avatar_driver_upload_move_file_before</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15561">PHPBB3-15561</a>] - Add core events for adding columns to MySQL and Postgres search backends</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15568">PHPBB3-15568</a>] - Update depencies to latest versions</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15569">PHPBB3-15569</a>] - Adjust update instructions to suggest file replacement method</li>
|
||||
</ul>
|
||||
<h4>New Feature</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15398">PHPBB3-15398</a>] - Add event to oauth login after ID check</li>
|
||||
</ul>
|
||||
<h4>Security Issue</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15570">PHPBB3-15570</a>] - Extension version check is restricted to TLS 1.0</li>
|
||||
</ul>
|
||||
<h4>Task</h4>
|
||||
<ul>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15466">PHPBB3-15466</a>] - Move Nils in CREDITS.txt</li>
|
||||
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-15516">PHPBB3-15516</a>] - Add instructions on running UI tests</li>
|
||||
</ul>
|
||||
|
||||
<a name="v321"></a><h3>Changes since 3.2.1</h3>
|
||||
<h4>Security Issue</h4>
|
||||
<ul>
|
||||
|
||||
36
phpBB/phpbb/db/migration/data/v32x/v323rc1.php
Normal file
36
phpBB/phpbb/db/migration/data/v32x/v323rc1.php
Normal file
@ -0,0 +1,36 @@
|
||||
<?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\v32x;
|
||||
|
||||
class v323rc1 extends \phpbb\db\migration\migration
|
||||
{
|
||||
public function effectively_installed()
|
||||
{
|
||||
return phpbb_version_compare($this->config['version'], '3.2.3-RC1', '>=');
|
||||
}
|
||||
|
||||
static public function depends_on()
|
||||
{
|
||||
return array(
|
||||
'\phpbb\db\migration\data\v32x\enable_accurate_pm_button',
|
||||
);
|
||||
}
|
||||
|
||||
public function update_data()
|
||||
{
|
||||
return array(
|
||||
array('config.update', array('version', '3.2.3-RC1')),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -86,7 +86,8 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
* check for to see if it exists
|
||||
* @param bool $lazy Checks lazily if the module exists. Returns true if it exists in at
|
||||
* least one given parent.
|
||||
* @return bool true if module exists in *all* given parents, false if not
|
||||
* @return bool true if module exists in *all* given parents, false if not in any given parent;
|
||||
* true if ignoring parent check and module exists class wide, false if not found at all.
|
||||
*/
|
||||
public function exists($class, $parent, $module, $lazy = false)
|
||||
{
|
||||
@ -110,6 +111,10 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
$parent_sqls[] = 'AND parent_id = ' . (int) $parent_id;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$parent_sqls[] = '';
|
||||
}
|
||||
|
||||
foreach ($parent_sqls as $parent_sql)
|
||||
{
|
||||
@ -126,7 +131,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if ($lazy && $module_id)
|
||||
if ($lazy && $module_id)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -52,11 +52,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
array(
|
||||
'',
|
||||
'ACP_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
0,
|
||||
'ACP_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
|
||||
// Test the existing category lazily
|
||||
array(
|
||||
'',
|
||||
'ACP_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
0,
|
||||
'ACP_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
|
||||
@ -65,15 +93,38 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
'',
|
||||
'ACP_MODULE',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_MODULE',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'ACP_CAT',
|
||||
'ACP_MODULE',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
|
||||
// Test the existing module lazily
|
||||
array(
|
||||
'',
|
||||
'ACP_MODULE',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_MODULE',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'ACP_CAT',
|
||||
'ACP_MODULE',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
|
||||
@ -82,11 +133,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
'',
|
||||
'ACP_NON_EXISTANT_CAT',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_NON_EXISTANT_CAT',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
'ACP_CAT',
|
||||
'ACP_NON_EXISTANT_MODULE',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
|
||||
// Test for non-existant modules lazily
|
||||
array(
|
||||
'',
|
||||
'ACP_NON_EXISTANT_CAT',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'ACP_NON_EXISTANT_CAT',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
'ACP_CAT',
|
||||
'ACP_NON_EXISTANT_MODULE',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -94,9 +173,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
/**
|
||||
* @dataProvider exists_data_acp
|
||||
*/
|
||||
public function test_exists_acp($parent, $module, $expected)
|
||||
public function test_exists_acp($parent, $module, $lazy, $expected)
|
||||
{
|
||||
$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module));
|
||||
$this->assertEquals($expected, $this->tool->exists('acp', $parent, $module, $lazy));
|
||||
}
|
||||
|
||||
public function exists_data_ucp()
|
||||
@ -106,11 +185,39 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
array(
|
||||
'',
|
||||
'UCP_MAIN_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
0,
|
||||
'UCP_MAIN_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'UCP_MAIN_CAT',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
|
||||
// Test the existing category lazily
|
||||
array(
|
||||
'',
|
||||
'UCP_MAIN_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
0,
|
||||
'UCP_MAIN_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'UCP_MAIN_CAT',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
|
||||
@ -119,21 +226,51 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
'',
|
||||
'UCP_SUBCATEGORY',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'UCP_SUBCATEGORY',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'UCP_MAIN_CAT',
|
||||
'UCP_SUBCATEGORY',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'UCP_SUBCATEGORY',
|
||||
'UCP_MODULE',
|
||||
false,
|
||||
true,
|
||||
),
|
||||
|
||||
// Test the existing module lazily
|
||||
array(
|
||||
'',
|
||||
'UCP_SUBCATEGORY',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
false,
|
||||
'UCP_SUBCATEGORY',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'UCP_MAIN_CAT',
|
||||
'UCP_SUBCATEGORY',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
array(
|
||||
'UCP_SUBCATEGORY',
|
||||
'UCP_MODULE',
|
||||
true,
|
||||
true,
|
||||
),
|
||||
|
||||
// Test for non-existant modules
|
||||
@ -141,11 +278,27 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
'',
|
||||
'UCP_NON_EXISTANT_CAT',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
'UCP_MAIN_CAT',
|
||||
'UCP_NON_EXISTANT_MODULE',
|
||||
false,
|
||||
false,
|
||||
),
|
||||
|
||||
// Test for non-existant modules lazily
|
||||
array(
|
||||
'',
|
||||
'UCP_NON_EXISTANT_CAT',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
array(
|
||||
'UCP_MAIN_CAT',
|
||||
'UCP_NON_EXISTANT_MODULE',
|
||||
true,
|
||||
false,
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -153,9 +306,9 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
|
||||
/**
|
||||
* @dataProvider exists_data_ucp
|
||||
*/
|
||||
public function test_exists_ucp($parent, $module, $expected)
|
||||
public function test_exists_ucp($parent, $module, $lazy, $expected)
|
||||
{
|
||||
$this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module));
|
||||
$this->assertEquals($expected, $this->tool->exists('ucp', $parent, $module, $lazy));
|
||||
}
|
||||
|
||||
public function test_add()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user