diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:00:12 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:00:12 +0530 |
| commit | e8b535bf9beda58ea8f75071ed31934534849cb1 (patch) | |
| tree | 36de3a5c8f46dda54d593593f71cb221cd9085ec /phpBB/install/database_update.php | |
| parent | abd299b0a98be01499b31eb6901aca73d8c2b192 (diff) | |
| parent | 6298cce464ea2035c107549dfed9bfcb2f985f9c (diff) | |
| download | forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.gz forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.bz2 forums-e8b535bf9beda58ea8f75071ed31934534849cb1.tar.xz forums-e8b535bf9beda58ea8f75071ed31934534849cb1.zip | |
Merge branch 'develop' into ticket/10820-develop
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
[ticket/11599] Copy the forums into a static array for later reuse
[ticket/11602] Do not call localize_errors() if avatars are disabled
[ticket/11601] Add protected method for database sync and call it
[ticket/11601] Split post_setup_synchronisation logic from xml parsing
[ticket/11550] Specify a valid path so it's clearer that it must be a path
[ticket/11550] Move comments to correct function
[ticket/11550] We use a different fixture set for extension_acp_test.php
[ticket/11550] Fixtures should only be directories not files
[ticket/11550] Use new functionality from the test case helpers
[ticket/11550] Move functionality for copying/restoring to test case helpers
[ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
[ticket/11543] Add more users so #hidden <> #normal
[ticket/11590] Close database connections when tearDown() is called
[ticket/develop/11543] Use plurals in develop
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
[ticket/11481] Move prepended slash from calls into function
...
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5ea950bfad..b20ca1e4ea 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -213,8 +213,8 @@ if (!$db_tools->sql_table_exists($table_prefix . 'migrations')) } $migrator = $phpbb_container->get('migrator'); -$extension_manager = $phpbb_container->get('ext.manager'); -$finder = $extension_manager->get_finder(); +$phpbb_extension_manager = $phpbb_container->get('ext.manager'); +$finder = $phpbb_extension_manager->get_finder(); $migrations = $finder ->core_path('includes/db/migration/data/') @@ -263,9 +263,8 @@ while (!$migrator->finished()) // Are we approaching the time limit? If so we want to pause the update and continue after refreshing if ((time() - $update_start_time) >= $safe_time_limit) { - //echo '<meta http-equiv="refresh" content="0;url=' . str_replace('&', '&', append_sid($phpbb_root_path . 'test.' . $phpEx)) . '" />'; echo $user->lang['DATABASE_UPDATE_NOT_COMPLETED'] . '<br />'; - echo '<a href="' . append_sid($phpbb_root_path . 'test.' . $phpEx) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>'; + echo '<a href="' . append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=' . $request->variable('type', 0) . '&language=' . $user->lang['USER_LANG']) . '">' . $user->lang['DATABASE_UPDATE_CONTINUE'] . '</a>'; phpbb_end_update($cache, $config); } @@ -276,6 +275,17 @@ if ($orig_version != $config['version']) add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $config['version']); } -echo $user->lang['DATABASE_UPDATE_COMPLETE']; +echo $user->lang['DATABASE_UPDATE_COMPLETE'] . '<br />'; + +if ($request->variable('type', 0)) +{ + echo $user->lang['INLINE_UPDATE_SUCCESSFUL'] . '<br /><br />'; + echo '<a href="' . append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update&sub=file_check&language=' . $user->lang['USER_LANG']) . '" class="button1">' . $user->lang['CONTINUE_UPDATE_NOW'] . '</a>'; +} +else +{ + echo '<div class="errorbox">' . $user->lang['UPDATE_FILES_NOTICE'] . '</div>'; + echo $user->lang['COMPLETE_LOGIN_TO_BOARD']; +} phpbb_end_update($cache, $config); |