From 79287abd7b3b6e837774bda6971061c923050d45 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 1 Jan 2020 16:23:23 +0100
Subject: [PATCH] [ticket/16285] Add sanity checks to migrations for 3.3
PHPBB3-16285
---
.../data/v330/add_display_unapproved_posts_config.php | 10 ++++++++++
.../db/migration/data/v330/remove_attachment_flash.php | 9 +++++++--
phpBB/phpbb/db/migration/data/v330/v330b2.php | 1 +
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',
);
}