mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 18:26:32 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop

Browse Source 
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
  [ticket/10308] fixes indentation
  [ticket/10308] fixes language variable name
  [ticket/10308] makes variable boolean
  [ticket/10308] fixes sql query, limit it to 1
  [ticket/10308] fixes user deletion if no posts
  [ticket/10308] renames language key to USER_NO_POSTS_DELETE
  [ticket/10308] fix language and user's total posts
  [ticket/10308] fixes language entity.
  [ticket/10308] Displays message to user if there are no posts.
  [ticket/10308] disable retain/ delete posts option when deleting a user
This commit is contained in:
Nils Adermann
2012-05-29 16:40:00 +02:00
parent 657942ec29 041b7be77e
commit 8438b61cef
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_users.php
View File

@@ -1001,6 +1001,13 @@ class acp_users
$user_row['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
$db->sql_freeresult($result);
$sql = 'SELECT post_id
FROM ' . POSTS_TABLE . '
WHERE poster_id = '. $user_id;
$result = $db->sql_query_limit($sql, 1);
$user_row['user_has_posts'] = (bool) $db->sql_fetchfield('post_id');
$db->sql_freeresult($result);
$template->assign_vars(array(
'L_NAME_CHARS_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
'L_CHANGE_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars']), $user->lang('CHARACTERS', (int) $config['max_pass_chars'])),
@@ -1028,6 +1035,7 @@ class acp_users
'USER_EMAIL' => $user_row['user_email'],
'USER_WARNINGS' => $user_row['user_warnings'],
'USER_POSTS' => $user_row['user_posts'],
'USER_HAS_POSTS' => $user_row['user_has_posts'],
'USER_INACTIVE_REASON' => $inactive_reason,
));