aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-03-04 18:52:50 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-03-04 18:52:50 +0100
commit5695097b8a691d2c18615e59420ed383b6a34af3 (patch)
treeb384d2d59ab51439397a79dc04704b68903d0f8f
parentbee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
parentae15fabb323c8f76ad2c8c994c2d205aabeafcbe (diff)
downloadforums-5695097b8a691d2c18615e59420ed383b6a34af3.tar
forums-5695097b8a691d2c18615e59420ed383b6a34af3.tar.gz
forums-5695097b8a691d2c18615e59420ed383b6a34af3.tar.bz2
forums-5695097b8a691d2c18615e59420ed383b6a34af3.tar.xz
forums-5695097b8a691d2c18615e59420ed383b6a34af3.zip
Merge remote-tracking branch 'EXreaction/ticket/11396' into develop
* EXreaction/ticket/11396: [ticket/11396] Rename insert_migration to set_migration_state
-rw-r--r--phpBB/includes/db/migrator.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..7b5e8cb2de 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -174,7 +174,7 @@ class phpbb_db_migrator
'migration_start_time' => time(),
'migration_end_time' => time(),
);
- $this->insert_migration($name, $state);
+ $this->set_migration_state($name, $state);
}
}
@@ -350,7 +350,7 @@ class phpbb_db_migrator
}
}
- $this->insert_migration($name, $state);
+ $this->set_migration_state($name, $state);
return true;
}
@@ -422,7 +422,7 @@ class phpbb_db_migrator
$state['migration_data_done'] = ($result === true) ? false : true;
}
- $this->insert_migration($name, $state);
+ $this->set_migration_state($name, $state);
}
else
{
@@ -641,7 +641,7 @@ class phpbb_db_migrator
* @param array $state
* @return null
*/
- protected function insert_migration($name, $state)
+ protected function set_migration_state($name, $state)
{
$migration_row = $state;
$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);