1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-04 07:53:06 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-01-02 10:46:56 +01:00
commit fa39235a0d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 18 additions and 2 deletions

@ -15,6 +15,16 @@ namespace phpbb\db\migration\data\v330;
class add_display_unapproved_posts_config extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return $this->config->offsetExists('display_unapproved_posts');
}
public static function depends_on()
{
return ['\phpbb\db\migration\data\v330\dev',];
}
public function update_data()
{
return [

@ -21,8 +21,13 @@ class remove_attachment_flash extends \phpbb\db\migration\migration
const ATTACHMENT_CATEGORY_FLASH = 5;
protected $cat_id = array(
self::ATTACHMENT_CATEGORY_FLASH,
);
self::ATTACHMENT_CATEGORY_FLASH,
);
public static function depends_on()
{
return ['\phpbb\db\migration\data\v330\dev',];
}
public function update_data()
{

@ -26,6 +26,7 @@ class v330b2 extends \phpbb\db\migration\migration
'\phpbb\db\migration\data\v330\add_display_unapproved_posts_config',
'\phpbb\db\migration\data\v330\forums_legend_limit',
'\phpbb\db\migration\data\v330\remove_email_hash',
'\phpbb\db\migration\data\v330\v330b1',
);
}