Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-09-16 17:29:53 +02:00
commit 36ef12aa03
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -189,6 +189,9 @@ class user extends \phpbb\session
/** /**
* Event to load language files and modify user data on every page * Event to load language files and modify user data on every page
* *
* Note: To load language file with this event, see description
* of lang_set_ext variable.
*
* @event core.user_setup * @event core.user_setup
* @var array user_data Array with user's data row * @var array user_data Array with user's data row
* @var string user_lang_name Basename of the user's langauge * @var string user_lang_name Basename of the user's langauge