diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:08:01 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2016-02-13 18:08:01 +0100 |
commit | 8663edce760da8451906fc557706b2980a424936 (patch) | |
tree | 65bc28191313e01494a36ce295445955ee5e70d0 /phpBB/includes/functions_acp.php | |
parent | 971fe13a2893bf9ff550d2ae60de9613d56dda62 (diff) | |
parent | 17e21d5140ccb99363a32bd64c32af6012c1ce97 (diff) | |
download | forums-8663edce760da8451906fc557706b2980a424936.tar forums-8663edce760da8451906fc557706b2980a424936.tar.gz forums-8663edce760da8451906fc557706b2980a424936.tar.bz2 forums-8663edce760da8451906fc557706b2980a424936.tar.xz forums-8663edce760da8451906fc557706b2980a424936.zip |
Merge branch '3.1.x' into 3.2.x
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/constants.php
phpBB/includes/functions_user.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/includes/functions_acp.php')
-rw-r--r-- | phpBB/includes/functions_acp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index d710d984b7..dc43957933 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -55,6 +55,8 @@ function adm_page_header($page_title) return; } + $user->update_session_infos(); + // gzip_compression if ($config['gzip_compress']) { @@ -166,8 +168,6 @@ 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( |