diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:42:37 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:42:37 +0200 |
| commit | 9ead56acb3a64f2a6ac20336e02c0a976935bd3b (patch) | |
| tree | 9ef5ca1dd2927a0d22edad2a244758e1c5e9c2d1 /phpBB/includes | |
| parent | efa96e1817847b94abe6d6d0f3f4a8563339f745 (diff) | |
| parent | 041b7be77ecd4e52048b94b4e47ad8268716a032 (diff) | |
| download | forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.gz forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.bz2 forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.xz forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympus
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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 363c900edc..70e08f79f2 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1009,6 +1009,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' => sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']), 'L_CHANGE_PASSWORD_EXPLAIN' => sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']), @@ -1036,6 +1043,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, )); |