Skip to content

Commit ccc598f

Browse files
authored
Merge pull request phpbb#6900 from iMattPro/ticket/17585
[ticket/17585] Revert to graceful module exists check in module remove tool
2 parents 278a31b + e65031d commit ccc598f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

phpBB/phpbb/db/migration/tool/module.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public function remove($class, $parent = 0, $module = '')
377377
{
378378
if (!$this->exists($class, $parent, $module, true))
379379
{
380-
throw new \phpbb\db\migration\exception('MODULE_NOT_EXIST', $module);
380+
return;
381381
}
382382

383383
$parent_sql = '';

tests/migrations/migration_test_base.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function getDataSet()
5959

6060
protected function setUp(): void
6161
{
62-
global $cache, $db, $phpbb_log, $phpbb_root_path, $phpEx, $skip_add_log, $table_prefix, $user;
62+
global $cache, $db, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $skip_add_log, $table_prefix, $user;
6363

6464
parent::setUp();
6565

0 commit comments

Comments
 (0)