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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9623] Proper UTF8 encoding for usernames in pruning section
  [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"
  [ticket/9179] Remove unnecessary newline.
  [ticket/9147] "Change topic type"-option "Normal" always selected.
This commit is contained in:
Andreas Fischer 2010-06-15 15:02:16 +02:00
commit fe690779d4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/acp/acp_prune.php
View file

@ -315,8 +315,8 @@ class acp_prune
'mode' => $mode,
'prune' => 1,
'users' => request_var('users', '', true),
'username' => request_var('username', '', true),
'users' => utf8_normalize_nfc(request_var('users', '', true)),
'username' => utf8_normalize_nfc(request_var('username', '', true)),
'email' => request_var('email', ''),
'joined_select' => request_var('joined_select', ''),
'joined' => request_var('joined', ''),
@ -369,7 +369,7 @@ class acp_prune
{
global $user, $db;
$users = request_var('users', '', true);
$users = utf8_normalize_nfc(request_var('users', '', true));
if ($users)
{
@ -378,7 +378,7 @@ class acp_prune
}
else
{
$username = request_var('username', '', true);
$username = utf8_normalize_nfc(request_var('username', '', true));
$email = request_var('email', '');
$joined_select = request_var('joined_select', 'lt');

1
phpBB/includes/constants.php
View file

@ -121,7 +121,6 @@ define('NOTIFY_BOTH', 2);
define('NOTIFY_YES', 0);
define('NOTIFY_NO', 1);
// Email Priority Settings
define('MAIL_LOW_PRIORITY', 4);
define('MAIL_NORMAL_PRIORITY', 3);

2
phpBB/includes/functions_posting.php
View file

@ -348,7 +348,7 @@ function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL)
{
$topic_type_array = array_merge(array(0 => array(
'VALUE' => POST_NORMAL,
'S_CHECKED' => ($topic_type == POST_NORMAL) ? ' checked="checked"' : '',
'S_CHECKED' => ($cur_topic_type == POST_NORMAL) ? ' checked="checked"' : '',
'L_TOPIC_TYPE' => $user->lang['POST_NORMAL'])),
$topic_type_array

1
phpBB/includes/functions_user.php
View file

@ -297,6 +297,7 @@ function user_add($user_row, $cp_data = false)
if ($config['new_member_group_default'])
{
group_user_add($add_group_id, $user_id, false, false, true);
$user_row['group_id'] = $add_group_id;
}
else
{