diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-07 11:40:40 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-07 11:40:40 +0100 |
| commit | b5ddd87c4230261fd9b2b53912835193136d1c53 (patch) | |
| tree | b9b7cdf10f2699949458be99e83513f38915a7d3 /phpBB | |
| parent | 122c1c6e05c0c7d1fe282ecd09d833405c975993 (diff) | |
| parent | 8956ec0bd4b81f4a13838a3c94239ea95e509e5f (diff) | |
| download | forums-b5ddd87c4230261fd9b2b53912835193136d1c53.tar forums-b5ddd87c4230261fd9b2b53912835193136d1c53.tar.gz forums-b5ddd87c4230261fd9b2b53912835193136d1c53.tar.bz2 forums-b5ddd87c4230261fd9b2b53912835193136d1c53.tar.xz forums-b5ddd87c4230261fd9b2b53912835193136d1c53.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13303] Speed up migration dependency calculation.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 621a808a03..d03496eae3 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -59,6 +59,13 @@ class migrator protected $migrations = array(); /** + * Array of migrations that have been determined to be fulfillable + * + * @var array + */ + protected $fulfillable_migrations = array(); + + /** * 'name,' 'class,' and 'state' of the last migration run * * 'effectively_installed' set and set to true if the migration was effectively_installed @@ -653,7 +660,7 @@ class migrator */ public function unfulfillable($name) { - if (isset($this->migration_state[$name])) + if (isset($this->migration_state[$name]) || isset($this->fulfillable_migrations[$name])) { return false; } @@ -674,6 +681,7 @@ class migrator return $unfulfillable; } } + $this->fulfillable_migrations[$name] = true; return false; } |