diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-03-16 12:03:36 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-03-19 21:16:25 +0100 |
| commit | dd7e8c8d1df1602db3d30bf458a5320c888c1dde (patch) | |
| tree | 65e52f08da9d703b2b74f38e7e7abbf0c1d14ee7 /phpBB | |
| parent | fac814f8e7a5f025578d82fa1a8e8ed25b790bc4 (diff) | |
| download | forums-dd7e8c8d1df1602db3d30bf458a5320c888c1dde.tar forums-dd7e8c8d1df1602db3d30bf458a5320c888c1dde.tar.gz forums-dd7e8c8d1df1602db3d30bf458a5320c888c1dde.tar.bz2 forums-dd7e8c8d1df1602db3d30bf458a5320c888c1dde.tar.xz forums-dd7e8c8d1df1602db3d30bf458a5320c888c1dde.zip | |
[ticket/11169] Skip migration if "Users" category has been deleted
or the module has already been moved to that category
PHPBB3-11169
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php b/phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php index b246317d8f..ab5b1a535b 100644 --- a/phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php +++ b/phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php @@ -30,7 +30,9 @@ class acp_prune_users_module extends \phpbb\db\migration\migration $acp_prune_users_parent = (int) $this->db->sql_fetchfield('parent_id'); $this->db->sql_freeresult($result); - return $acp_cat_users_id === $acp_prune_users_parent; + // Skip migration if "Users" category has been deleted + // or the module has already been moved to that category + return !$acp_cat_users_id || $acp_cat_users_id === $acp_prune_users_parent; } static public function depends_on() |