mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
changes
git-svn-id: file:///svn/phpbb/trunk@7881 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
eaa4023fb4
commit
3b5b2f9695
5 changed files with 48 additions and 38 deletions
|
@ -30,7 +30,8 @@ header('Content-length: 43');
|
|||
|
||||
echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
|
||||
|
||||
flush();
|
||||
// test without flush ;)
|
||||
// flush();
|
||||
|
||||
/**
|
||||
* Run cron-like action
|
||||
|
|
|
@ -222,8 +222,10 @@ p a {
|
|||
<li>[Fix] Display php information page with the correct direction (Bug #12557)</li>
|
||||
<li>[Fix] Increased the number of style objects (styles, templates, themes and imagesets) possible from 127 to 65535 for MySQL (Bug #13179)</li>
|
||||
<li>[Fix] Although theoretically impossible in our code, removed the chance of trying to open a file that does not exist (Bug #13327)</li>
|
||||
<li>[Fix] Although theoretically impossible in our code, changed the handling of non-existent language files (Bug #13329, Bug #13331)</li>
|
||||
<li>[Fix] Although theoretically impossible in our code, changed the handling of non-existent language files (Bug #13329, #13331)</li>
|
||||
<li>[Fix] Removed extra ampersand from ACP link (Bug #13315)</li>
|
||||
<li>[Fix] used cleaned up version of given field identification for pre-filling a new custom profile field (Bug #13319)</li>
|
||||
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
@ -349,12 +349,12 @@ class acp_profile
|
|||
}
|
||||
|
||||
$field_row = array_merge($default_values[$field_type], array(
|
||||
'field_ident' => request_var('field_ident', ''),
|
||||
'field_ident' => utf8_clean_string(request_var('field_ident', '', true)),
|
||||
'field_required' => 0,
|
||||
'field_hide' => 0,
|
||||
'field_no_view' => 0,
|
||||
'field_show_on_reg' => 0,
|
||||
'lang_name' => '',
|
||||
'lang_name' => request_var('field_ident', '', true),
|
||||
'lang_explain' => '',
|
||||
'lang_default_value'=> '')
|
||||
);
|
||||
|
@ -381,7 +381,7 @@ class acp_profile
|
|||
$exclude[1][] = 'lang_options';
|
||||
}
|
||||
|
||||
$cp->vars['field_ident'] = request_var('field_ident', $field_row['field_ident']);
|
||||
$cp->vars['field_ident'] = ($action == 'create' && $step == 1) ? utf8_clean_string(request_var('field_ident', $field_row['field_ident'], true)) : request_var('field_ident', $field_row['field_ident']);
|
||||
$cp->vars['lang_name'] = request_var('lang_name', $field_row['lang_name'], true);
|
||||
$cp->vars['lang_explain'] = request_var('lang_explain', $field_row['lang_explain'], true);
|
||||
$cp->vars['lang_default_value'] = request_var('lang_default_value', $field_row['lang_default_value'], true);
|
||||
|
|
|
@ -368,6 +368,12 @@ function user_delete($mode, $user_id, $post_username = false)
|
|||
$post_username = $user->lang['GUEST'];
|
||||
}
|
||||
|
||||
// If the user is inactive and newly registered we assume no posts from this user being there...
|
||||
if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts'])
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql = 'UPDATE ' . FORUMS_TABLE . '
|
||||
SET forum_last_poster_id = ' . ANONYMOUS . ", forum_last_poster_name = '" . $db->sql_escape($post_username) . "', forum_last_poster_colour = ''
|
||||
WHERE forum_last_poster_id = $user_id";
|
||||
|
@ -403,6 +409,7 @@ function user_delete($mode, $user_id, $post_username = false)
|
|||
WHERE user_id = ' . ANONYMOUS;
|
||||
$db->sql_query($sql);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'remove':
|
||||
|
|
|
@ -724,7 +724,7 @@ class module
|
|||
{
|
||||
$path = $phpbb_root_path . 'language/' . $file;
|
||||
|
||||
if (is_file($path) || is_link($path) || $file == '.' || $file == '..' || $file == 'CVS')
|
||||
if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS')
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue