diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-02 13:19:40 +0000 |
| commit | 7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3 (patch) | |
| tree | b2bbf1e855f1c185f76972777cef56b29e5e10d2 /phpBB/includes/functions_user.php | |
| parent | de1c536548c5b41d33a16f3afe12ba67000d7210 (diff) | |
| download | forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.gz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.bz2 forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.tar.xz forums-7ad986c37e15bc51f5dc2cb42a4fa6445fde51e3.zip | |
- a bunch of fixes
- added todos to the updater to make sure i do not forget. :)
git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d22add63ea..3272c9663e 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1973,7 +1973,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna case 'approve': // Make sure we only approve those which are pending ;) - $sql = 'SELECT u.user_id, u.user_email, u.username, u.user_notify_type, u.user_jabber, u.user_lang + $sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_jabber, u.user_lang FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug WHERE ug.group_id = ' . $group_id . ' AND ug.user_pending = 1 @@ -2176,7 +2176,7 @@ function group_memberships($group_id_ary = false, $user_id_ary = false, $return_ $group_id_ary = (!is_array($group_id_ary)) ? array($group_id_ary) : $group_id_ary; } - $sql = 'SELECT ug.*, u.username, u.user_email + $sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u WHERE ug.user_id = u.user_id AND '; |