diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-31 13:14:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-31 13:14:50 +0200 |
| commit | 399d9ee5e15179a74d7afa7c970cb212855c1804 (patch) | |
| tree | 919202249025dccd37729dbca3e995f9336d9a99 /phpBB | |
| parent | b3b92b7b188f07daae889b568a55c2b1b30ca6c1 (diff) | |
| parent | ec2cdbed6179f551910759f0e22714d17a683026 (diff) | |
| download | forums-399d9ee5e15179a74d7afa7c970cb212855c1804.tar forums-399d9ee5e15179a74d7afa7c970cb212855c1804.tar.gz forums-399d9ee5e15179a74d7afa7c970cb212855c1804.tar.bz2 forums-399d9ee5e15179a74d7afa7c970cb212855c1804.tar.xz forums-399d9ee5e15179a74d7afa7c970cb212855c1804.zip | |
Merge remote-tracking branch 'Elsensee/ticket/11570' into develop
* Elsensee/ticket/11570:
[ticket/11570] Fix link and make the notice more conspiciuous
[ticket/11570] Add link back to update process
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index be3cc60eaa..b20ca1e4ea 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -275,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); |