aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@gmail.com>2018-07-08 18:36:10 +0200
committerTristan Darricau <tristan.darricau@gmail.com>2018-07-08 18:36:10 +0200
commite680d468659e85c6440d82e25a71cad5f563c24b (patch)
tree7a6c3316975c6cc37aab43cf559bd257fc4ca98b /phpBB/phpbb
parentf5e339455036953a90d6f57b4925c7e0599610a1 (diff)
parent9ee7b9b81f313537f8888f559024c5d54a787865 (diff)
downloadforums-e680d468659e85c6440d82e25a71cad5f563c24b.tar
forums-e680d468659e85c6440d82e25a71cad5f563c24b.tar.gz
forums-e680d468659e85c6440d82e25a71cad5f563c24b.tar.bz2
forums-e680d468659e85c6440d82e25a71cad5f563c24b.tar.xz
forums-e680d468659e85c6440d82e25a71cad5f563c24b.zip
Merge pull request #5260 from senky/ticket/15696
[ticket/15696] 'if' module tool should support calling other tools * github.com:/phpbb/phpbb: [ticket/15696] Add tests [ticket/15696] Add support of other tools to 'if'
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migrator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index a425df56e8..2b0c66fc58 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -760,7 +760,7 @@ class migrator
$condition = $parameters[0];
- if (!$condition)
+ if (!$condition || (is_array($condition) && !$this->run_step($condition, $last_result, $reverse)))
{
return false;
}