aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_install.php
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-02-26 14:20:12 -0500
committerDavid King <imkingdavid@gmail.com>2013-02-26 14:20:12 -0500
commit82b20cc2579f8109e2d3370866699c21a1b658bf (patch)
treee4bc81e705718a69ea634180ba37a1ef5bd92c85 /phpBB/install/install_install.php
parent9b38c4579e80a9013b6ecad71fce38e930b67838 (diff)
parente632049e197131df9fbe8c078007cf37cf94c241 (diff)
downloadforums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.gz
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.bz2
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.tar.xz
forums-82b20cc2579f8109e2d3370866699c21a1b658bf.zip
Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop
# By Nathan Guse (14) and Nathaniel Guse (4) # Via Nathaniel Guse * EXreaction/feature/migrations-data: [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.php16
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)