makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-11-24 21:21:50 +00:00
commit eab57f481b
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/install/convertors/functions_phpbb20.php
View file

@ -1420,9 +1420,9 @@ function phpbb_attachment_extension_group_name()
$result = $db->sql_query($sql);
$extension_groups_updated = array();
while ($lang_dir = $db->sql_fetchfield('lang_dir'))
while ($row = $db->sql_fetchrow($result))
{
$lang_dir = basename($lang_dir);
$lang_dir = basename($row['lang_dir']);
$lang_file = $phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx;
if (!file_exists($lang_file))

15
phpBB/memberlist.php
View file

@ -816,10 +816,25 @@ switch ($mode)
*
* @event core.memberlist_modify_view_profile_template_vars
* @var array template_ary Array with user's template vars
* @var int user_id The user ID
* @var bool user_notes_enabled Is the mcp user notes module enabled?
* @var bool warn_user_enabled Is the mcp warnings module enabled?
* @var bool friends_enabled Is the ucp friends module enabled?
* @var bool foes_enabled Is the ucp foes module enabled?
* @var bool friend Is the user friend?
* @var bool foe Is the user foe?
* @since 3.2.6-RC1
* @changed 3.3.15-RC1 Added vars user_id, user_notes_enabled, warn_user_enabled, friend, friends_enabled, foe, foes_enabled
*/
$vars = array(
'template_ary',
'user_id',
'user_notes_enabled',
'warn_user_enabled',
'friend',
'friends_enabled',
'foe',
'foes_enabled',
);
extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_view_profile_template_vars', compact($vars)));