mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 11:35:33 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1746 from EXreaction/ticket/11882

Browse Source 
[ticket/11882] Incorrect dependency in signature module auth migration
This commit is contained in:
David King 2013-10-03 09:34:12 -07:00
commit 80b21e8049
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/db/migration/data/v310/signature_module_auth.php
View File

@ -27,7 +27,7 @@ class signature_module_auth extends \phpbb\db\migration\migration
static public function depends_on() 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() public function update_data()

5
phpBB/phpbb/db/migrator.php
View File

@ -192,6 +192,11 @@ class migrator
foreach ($state['migration_depends_on'] as $depend) 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]) || if (!isset($this->migration_state[$depend]) ||
!$this->migration_state[$depend]['migration_schema_done'] || !$this->migration_state[$depend]['migration_schema_done'] ||
!$this->migration_state[$depend]['migration_data_done']) !$this->migration_state[$depend]['migration_data_done'])