aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-02-28 10:42:18 -0500
committerDavid King <imkingdavid@gmail.com>2013-02-28 10:42:18 -0500
commite20da8fb8138d8dbd345d75201cf12fb8ce3d370 (patch)
treef620130fd9a38f7dccd1a24b157186c5d8db857a
parent80bd78a5e5e1069773c05073cd47662a311bda79 (diff)
parentf9cbf5b4c7ea4f4eb1438d98ccc1cb71b0fea2af (diff)
downloadforums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.gz
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.bz2
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.tar.xz
forums-e20da8fb8138d8dbd345d75201cf12fb8ce3d370.zip
Merge remote-tracking branch 'EXreaction/ticket/11369' into develop
# By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11369: [ticket/11369] Reverting migration throws error
-rw-r--r--phpBB/includes/db/migrator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 74f71775f3..d6bcae6ca6 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -434,7 +434,7 @@ class phpbb_db_migrator
}
else
{
- $result = $this->process_data_step($migration->revert_data(), $state['migration_data_state'], false);
+ $result = $this->process_data_step($migration->revert_data(), '', false);
$state['migration_data_state'] = ($result === true) ? '' : $result;
$state['migration_data_done'] = ($result === true) ? false : true;