[Fix] Multiple PM recipients not separated (Bug #13876)
[Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)
[Fix] Convert empty homepage fields (Bug #13917)
-
-
+
[Fix] Use board default DST setting on creating new profiles (Bug #11563)
+
[Feature] New constant PHPBB_EMBEDDED can be used to let phpBB not call exit; if wrapped/embedded (We may re-check this constant on other code locations later too)
+
[Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.
+
[Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
+
[Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
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 .= '';
+
+ $selected = ($mode == $row['module_mode']) ? ' selected="selected"' : '';
+ $s_form_options .= '';
}
+ $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' => '',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 5d0627475c..af88b47db5 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -353,7 +353,7 @@ $lang = array_merge($lang, array(
'BROWSER_VALID' => 'Validate browser',
'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.',
'CHECK_DNSBL' => 'Check IP against DNS Blackhole List',
- 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: spamcop.net, dsbl.org and spamhaus.org. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
+ 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: spamcop.net, dsbl.org and www.spamhaus.org. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.',
'CLASS_B' => 'A.B',
'CLASS_C' => 'A.B.C',
'EMAIL_CHECK_MX' => 'Check e-mail domain for valid MX record',
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 92b44b3f21..af357a90b9 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -113,6 +113,7 @@ switch ($mode)
else
{
upload_popup();
+ garbage_collection();
exit;
}
break;
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 80dd20da99..61747f7e56 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -227,7 +227,8 @@ function addquote(post_id, username)
theSelection = theSelection.replace(//ig, '\n');
theSelection = theSelection.replace(/<\;/ig, '<');
theSelection = theSelection.replace(/>\;/ig, '>');
- theSelection = theSelection.replace(/&\;/ig, '&');
+ theSelection = theSelection.replace(/&\;/ig, '&');
+ theSelection = theSelection.replace(/ \;/ig, ' ');
}
else if (document.all)
{