3 files changed, 26 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 5b6a790e97..2a059121e0 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -114,20 +114,26 @@ class acp_users
 		// Generate overall "header" for user admin
 		$s_form_options = '';
 
-		// Include info file...
-		include_once($phpbb_root_path . 'includes/acp/info/acp_users.' . $phpEx);
-		$forms_ary = acp_users_info::module();
+		// Build modes dropdown list
+		$sql = 'SELECT module_mode, module_auth
+			FROM ' . MODULES_TABLE . '
+			WHERE parent_id = ' . $this->p_master->p_parent . "
+				AND module_basename = 'users'
+				AND module_enabled = 1
+			ORDER BY left_id";
+		$result = $db->sql_query($sql);
 
-		foreach ($forms_ary['modes'] as $value => $ary)
+		while ($row = $db->sql_fetchrow($result))
 		{
-			if (!$this->p_master->module_auth($ary['auth']))
+			if (!$this->p_master->module_auth($row['module_auth']))
 			{
 				continue;
 			}
-			
-			$selected = ($mode == $value) ? ' selected="selected"' : '';
-			$s_form_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($value)] . '</option>';
+
+			$selected = ($mode == $row['module_mode']) ? ' selected="selected"' : '';
+			$s_form_options .= '<option value="' . $row['module_mode'] . '"' . $selected . '>' . $user->lang['ACP_USER_' . strtoupper($row['module_mode'])] . '</option>';
 		}
+		$db->sql_freeresult($result);
 
 		$template->assign_vars(array(
 			'U_BACK'			=> $this->u_action,
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index daff12e3a8..5632d78022 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1582,6 +1582,13 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL;
 
+	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
+	// They could mimick most of what is within this function
+	if (function_exists('append_sid_phpbb_hook'))
+	{
+		return append_sid_phpbb_hook($url, $params, $is_amp, $session_id);
+	}
+
 	// Assign sid if session id is not specified
 	if ($session_id === false)
 	{
@@ -4276,7 +4283,10 @@ function page_footer($run_cron = true)
 
 	garbage_collection();
 
-	exit;
+	if (!defined('PHPBB_EMBEDDED'))
+	{
+		exit;
+	}
 }
 
 /**
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 08b2d963ca..2decddb54f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -181,7 +181,7 @@ function user_add($user_row, $cp_data = false)
 		'user_lastpost_time'	=> 0,
 		'user_lastpage'			=> '',
 		'user_posts'			=> 0,
-		'user_dst'				=> 0,
+		'user_dst'				=> (int) $config['board_dst'],
 		'user_colour'			=> '',
 		'user_occ'				=> '',
 		'user_interests'		=> '',