aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-01 16:23:23 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-01 16:23:23 +0100
commit79287abd7b3b6e837774bda6971061c923050d45 (patch)
tree03d2d8f065eefc268c5a0bb9545d473ce2cffb46 /phpBB
parent6ee537b3f2f45b300e38a55759566abb0752ec0f (diff)
downloadforums-79287abd7b3b6e837774bda6971061c923050d45.tar
forums-79287abd7b3b6e837774bda6971061c923050d45.tar.gz
forums-79287abd7b3b6e837774bda6971061c923050d45.tar.bz2
forums-79287abd7b3b6e837774bda6971061c923050d45.tar.xz
forums-79287abd7b3b6e837774bda6971061c923050d45.zip
[ticket/16285] Add sanity checks to migrations for 3.3
PHPBB3-16285
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/db/migration/data/v330/add_display_unapproved_posts_config.php10
-rw-r--r--phpBB/phpbb/db/migration/data/v330/remove_attachment_flash.php9
-rw-r--r--phpBB/phpbb/db/migration/data/v330/v330b2.php1
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',
);
}
ndicate your decision by * deleting the provisions above and replace them with the notice and * other provisions required by the GPL. If you do not delete the * provisions above, a recipient may use your version of this file * under either the MPL or the GPL. */ #ifndef _LINUX_VG468_H #define _LINUX_VG468_H /* Special bit in I365_IDENT used for Vadem chip detection */ #define I365_IDENT_VADEM 0x08 /* Special definitions in I365_POWER */ #define VG468_VPP2_MASK 0x0c #define VG468_VPP2_5V 0x04 #define VG468_VPP2_12V 0x08 /* Unique Vadem registers */ #define VG469_VSENSE 0x1f /* Card voltage sense */ #define VG469_VSELECT 0x2f /* Card voltage select */ #define VG468_CTL 0x38 /* Control register */ #define VG468_TIMER 0x39 /* Timer control */ #define VG468_MISC 0x3a /* Miscellaneous */ #define VG468_GPIO_CFG 0x3b /* GPIO configuration */ #define VG469_EXT_MODE 0x3c /* Extended mode register */ #define VG468_SELECT 0x3d /* Programmable chip select */ #define VG468_SELECT_CFG 0x3e /* Chip select configuration */ #define VG468_ATA 0x3f /* ATA control */ /* Flags for VG469_VSENSE */ #define VG469_VSENSE_A_VS1 0x01 #define VG469_VSENSE_A_VS2 0x02 #define VG469_VSENSE_B_VS1 0x04 #define VG469_VSENSE_B_VS2 0x08 /* Flags for VG469_VSELECT */ #define VG469_VSEL_VCC 0x03 #define VG469_VSEL_5V 0x00 #define VG469_VSEL_3V 0x03 #define VG469_VSEL_MAX 0x0c #define VG469_VSEL_EXT_STAT 0x10 #define VG469_VSEL_EXT_BUS 0x20 #define VG469_VSEL_MIXED 0x40 #define VG469_VSEL_ISA 0x80 /* Flags for VG468_CTL */ #define VG468_CTL_SLOW 0x01 /* 600ns memory timing */ #define VG468_CTL_ASYNC 0x02 /* Asynchronous bus clocking */ #define VG468_CTL_TSSI 0x08 /* Tri-state some outputs */ #define VG468_CTL_DELAY 0x10 /* Card detect debounce */ #define VG468_CTL_INPACK 0x20 /* Obey INPACK signal? */ #define VG468_CTL_POLARITY 0x40 /* VCCEN polarity */ #define VG468_CTL_COMPAT 0x80 /* Compatibility stuff */ #define VG469_CTL_WS_COMPAT 0x04 /* Wait state compatibility */ #define VG469_CTL_STRETCH 0x10 /* LED stretch */ /* Flags for VG468_TIMER */ #define VG468_TIMER_ZEROPWR 0x10 /* Zero power control */ #define VG468_TIMER_SIGEN 0x20 /* Power up */ #define VG468_TIMER_STATUS 0x40 /* Activity timer status */ #define VG468_TIMER_RES 0x80 /* Timer resolution */ #define VG468_TIMER_MASK 0x0f /* Activity timer timeout */ /* Flags for VG468_MISC */ #define VG468_MISC_GPIO 0x04 /* General-purpose IO */ #define VG468_MISC_DMAWSB 0x08 /* DMA wait state control */ #define VG469_MISC_LEDENA 0x10 /* LED enable */ #define VG468_MISC_VADEMREV 0x40 /* Vadem revision control */ #define VG468_MISC_UNLOCK 0x80 /* Unique register lock */ /* Flags for VG469_EXT_MODE_A */ #define VG469_MODE_VPPST 0x03 /* Vpp steering control */ #define VG469_MODE_INT_SENSE 0x04 /* Internal voltage sense */ #define VG469_MODE_CABLE 0x08 #define VG469_MODE_COMPAT 0x10 /* i82365sl B or DF step */ #define VG469_MODE_TEST 0x20 #define VG469_MODE_RIO 0x40 /* Steer RIO to INTR? */ /* Flags for VG469_EXT_MODE_B */ #define VG469_MODE_B_3V 0x01 /* 3.3v for socket B */ #endif /* _LINUX_VG468_H */