aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-17 21:25:20 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-17 21:25:20 +0200
commit45a4cf7ac5c8b0c0028986f9ecd141a828651e46 (patch)
tree234858c4dd075bc1b5b1b0c4b43007c3074f9285 /phpBB/phpbb
parentdd89af715154e8719cbe8955ce86f464369e2740 (diff)
parent7729ae4ad0bb09256709af37f2998a0949fbad01 (diff)
downloadforums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar
forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.gz
forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.bz2
forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.xz
forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migrator.php19
1 files changed, 1 insertions, 18 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 43393a8935..44bea3c5d2 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -129,28 +129,11 @@ class migrator
* Sets the list of available migration class names to the given array.
*
* @param array $class_names An array of migration class names
- * @param bool $check_fulfillable If TRUE (default), we will check
- * if all of the migrations are fulfillable after loading them.
- * If FALSE, we will not check. You SHOULD check at least once
- * to prevent errors.
* @return null
- * @throws \phpbb\db\migration\exception
*/
- public function set_migrations($class_names, $check_fulfillable = true)
+ public function set_migrations($class_names)
{
$this->migrations = $class_names;
-
- if ($check_fulfillable)
- {
- foreach ($this->migrations as $name)
- {
- $unfulfillable = $this->unfulfillable($name);
- if ($unfulfillable !== false)
- {
- throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
- }
- }
- }
}
/**