mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
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
This commit is contained in:
Joas Schilling
2016-02-13 18:08:01 +01:00
parent 971fe13a28 17e21d5140
commit 8663edce76
7 changed files with 91 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions.php
View File

@@ -4146,6 +4146,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
}
}
$user->update_session_infos();
// Generate logged in/logged out status
if ($user->data['user_id'] != ANONYMOUS)
{
@@ -4577,8 +4579,6 @@ 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(