diff options
| author | David King <imkingdavid@gmail.com> | 2013-10-03 09:34:12 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-10-03 09:34:12 -0700 |
| commit | 80b21e8049a138d07553288029abf66700da9a5c (patch) | |
| tree | def612b3bdabdb5c678e8ae4f21319cfce96d34d /phpBB/phpbb | |
| parent | 2683188206e79c4a5b78ac16ffb43d1d53f3d5ff (diff) | |
| parent | 5bd7f1bd36a156767d4654d137d9705a171ae8ff (diff) | |
| download | forums-80b21e8049a138d07553288029abf66700da9a5c.tar forums-80b21e8049a138d07553288029abf66700da9a5c.tar.gz forums-80b21e8049a138d07553288029abf66700da9a5c.tar.bz2 forums-80b21e8049a138d07553288029abf66700da9a5c.tar.xz forums-80b21e8049a138d07553288029abf66700da9a5c.zip | |
Merge pull request #1746 from EXreaction/ticket/11882
[ticket/11882] Incorrect dependency in signature module auth migration
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/signature_module_auth.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php index a85e0be01c..6da1cb8009 100644 --- a/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php +++ b/phpBB/phpbb/db/migration/data/v310/signature_module_auth.php @@ -27,7 +27,7 @@ class signature_module_auth extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data\v31x\dev'); + return array('\phpbb\db\migration\data\v310\dev'); } public function update_data() diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 7efb23a230..9879ff2a85 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -192,6 +192,11 @@ class migrator foreach ($state['migration_depends_on'] as $depend) { + if ($this->unfulfillable($depend) !== false) + { + throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $depend); + } + if (!isset($this->migration_state[$depend]) || !$this->migration_state[$depend]['migration_schema_done'] || !$this->migration_state[$depend]['migration_data_done']) |