From b40cdb757fab3f28ef922c21ef39804674d4d8f5 Mon Sep 17 00:00:00 2001
From: kaileymsnay <kailey.snay@snayhomelab.com>
Date: Mon, 11 Nov 2024 14:13:29 -0500
Subject: [PATCH 1/2] [ticket/17431] Add more vars to memberlist event

PHPBB3-17431
---
 phpBB/memberlist.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index c846bdde05..dce5eb8d90 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -816,11 +816,26 @@ switch ($mode)
 		* Modify user's template vars before we display the profile
 		*
 		* @event core.memberlist_modify_view_profile_template_vars
-		* @var	array	template_ary	Array with user's 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)));
 

From 150bd59c82f2dca8b65652559d920f14ad53dfcc Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 21 Nov 2024 22:46:31 +0700
Subject: [PATCH 2/2] [ticket/17436] Fix phpBB 2.0 converter PHP fatal error

PHPBB-17436
---
 phpBB/install/convertors/functions_phpbb20.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index b89c086533..85a98ee739 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1418,9 +1418,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))