diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-01-02 10:46:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-02 10:46:56 +0100 |
| commit | fa39235a0d4656cb64276ae985a79791045918a0 (patch) | |
| tree | 78762b1abe3ac91a47fcac9f18ab8213fa058866 /phpBB/phpbb | |
| parent | Merge branch '3.3.x' (diff) | |
| parent | Merge pull request #5809 from marc1706/ticket/16285 (diff) | |
| download | phpbb-fa39235a0d4656cb64276ae985a79791045918a0.tar.gz phpbb-fa39235a0d4656cb64276ae985a79791045918a0.tar.bz2 phpbb-fa39235a0d4656cb64276ae985a79791045918a0.zip | |
Merge branch '3.3.x'
Diffstat (limited to 'phpBB/phpbb')
3 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php b/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php index b429270827..209aba3646 100644 --- a/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php +++ b/phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php @@ -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 [ diff --git a/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php b/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php index 11dc43483b..c136960905 100644 --- a/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php +++ b/phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php @@ -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() { diff --git a/phpBB/phpbb/db/migration/data/v330/v330b2.php b/phpBB/phpbb/db/migration/data/v330/v330b2.php index 1badc1387a..cb2198aad7 100644 --- a/phpBB/phpbb/db/migration/data/v330/v330b2.php +++ b/phpBB/phpbb/db/migration/data/v330/v330b2.php @@ -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', ); } |