diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-02-27 00:12:51 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-02-27 00:12:51 +0100 |
| commit | f76f36c6693d8c4545d45f1454db102b1b313d07 (patch) | |
| tree | f28782ba502d833e5f95491a420dd0f8c31b04a9 /phpBB/install/install_install.php | |
| parent | d61eb95b4868377cfc2a7a98b03a7d908418b1af (diff) | |
| parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
| download | forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.gz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.bz2 forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.xz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11367] Always freeresult
[ticket/11367] Migrator throws error if migrations table does not exist
[feature/migrations] Inject migrator rather than the container.
[feature/migrations] Use the user class for language handling
[feature/migrations] Fully revert the removal of the user_msnm field
[feature/migrations] Revert unrelated change to schema_data.sql
[feature/migrations] Remove user_msnm migration
[feature/migrations] Correct depends_on
[feature/migrations] Subdirectories for migration data
[feature/migrations] Reports table schema changes in recent develop
[feature/migrations] Automatically populate migrations table on install
[feature/migrations] effectively installed check for migration data
[feature/migrations] Comments for the return in the custom functions
[feature/migrations] Order the migrations schema in schema_data.sql
[feature/migrations] Fix migrations installer, schema for schema_data.sql
[feature/migrations] Make depends_on static to call it without dependencies
[feature/migrations] Remove hardcoded language, use lang instead.
[feature/migrations] Revert schema for migration data
[feature/migrations] Replace database_update.php with migrations updater
[feature/migrations] Rebuilding migrations data on develop
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 16a527b252..f0280acc40 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -114,6 +114,7 @@ class install_install extends module $this->add_bots($mode, $sub); $this->email_admin($mode, $sub); $this->disable_avatars_if_unwritable(); + $this->populate_migrations($phpbb_container->get('migrator'), $phpbb_root_path); // Remove the lock file @unlink($phpbb_root_path . 'cache/install_lock'); @@ -1881,6 +1882,21 @@ class install_install extends module } /** + * Populate migrations for the installation + * + * This "installs" all migrations from (root path)/includes/db/migrations/data. + * "installs" means it adds all migrations to the migrations table, but does not + * perform any of the actions in the migrations. + * + * @param phpbb_db_migrator $migrator + * @param string $phpbb_root_path + */ + function populate_migrations($migrator, $phpbb_root_path) + { + $migrator->populate_migrations_from_directory($phpbb_root_path . 'includes/db/migration/data/'); + } + + /** * Generate a list of available mail server authentication methods */ function mail_auth_select($selected_method) |
