mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-19 23:11:45 +02:00
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
This commit is contained in:
@@ -88,6 +88,8 @@ if ($mode == 'whois' && $auth->acl_get('a_') && $session_id)
|
||||
page_footer();
|
||||
}
|
||||
|
||||
$user->update_session_infos();
|
||||
|
||||
// Forum info
|
||||
$sql_ary = array(
|
||||
'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id',
|
||||
|
Reference in New Issue
Block a user