diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 22:16:02 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 22:16:02 -0500 |
| commit | 4f393ad0968e03085d19e8c7f71c755c9231918b (patch) | |
| tree | 7dc288f0f136edc2ee69e897c5969c40aed1c864 /phpBB/phpbb | |
| parent | f0036d2ac69f582c189bf26552d9710ae8f46c43 (diff) | |
| parent | ea15b879f127f3d121d8e78ae01457b43b702e58 (diff) | |
| download | forums-4f393ad0968e03085d19e8c7f71c755c9231918b.tar forums-4f393ad0968e03085d19e8c7f71c755c9231918b.tar.gz forums-4f393ad0968e03085d19e8c7f71c755c9231918b.tar.bz2 forums-4f393ad0968e03085d19e8c7f71c755c9231918b.tar.xz forums-4f393ad0968e03085d19e8c7f71c755c9231918b.zip | |
Merge remote-tracking branch 'remotes/Nicofuma/ticket/12432' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12432:
[ticket/12432] Correcting the assertion
[ticket/12432] Adding unit test
[ticket/12432] Migrator should not revert custom functions
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index d3bbbc63c5..5ad8563e5c 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -509,10 +509,17 @@ class migrator throw new \phpbb\db\migration\exception('MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE', $step); } - return array( - $parameters[0], - array($last_result), - ); + if ($reverse) + { + return false; + } + else + { + return array( + $parameters[0], + array($last_result), + ); + } break; default: |