diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 21:52:38 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-12-07 21:52:38 +0100 |
| commit | f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4 (patch) | |
| tree | fe32223e1e5019a0e9832faaf1f3195d1e9dbdf9 /phpBB/includes | |
| parent | 91df35e81e5e8a2311e7a28c5ebee48228139d6b (diff) | |
| parent | 4989df66a26fb8646326e1468a4ba2a6c84a8659 (diff) | |
| download | forums-f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4.tar forums-f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4.tar.gz forums-f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4.tar.bz2 forums-f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4.tar.xz forums-f14a9b70694ef1ff575e7db46fdcdec8c9bc87e4.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14261] Fix tests by removing old code.
[ticket/14261] Move the update of session informations to page_footer()
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d4f662626e..2a891bcbac 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4583,6 +4583,8 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = return; } + $user->update_session_infos(); + phpbb_check_and_display_sql_report($request, $auth, $db); $template->assign_vars(array( diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index f6c01c46ff..4a52657023 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -164,6 +164,8 @@ function adm_page_footer($copyright_html = true) return; } + $user->update_session_infos(); + phpbb_check_and_display_sql_report($request, $auth, $db); $template->assign_vars(array( |