aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-01 13:16:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-01 13:16:22 +0000
commit5f30881c2c11ffce73a75c3e5c18d1368e6777da (patch)
tree8e26e09db8abc91b1027e7d2e5756429706200d1 /phpBB/includes/acp/acp_users.php
parent888bbf6ff4e465ff8f60a34f0859796fe4adc09d (diff)
downloadforums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.gz
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.bz2
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.tar.xz
forums-5f30881c2c11ffce73a75c3e5c18d1368e6777da.zip
fix some bugs - hopefully not breaking anything...
git-svn-id: file:///svn/phpbb/trunk@6342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index bd4b0b1407..12fb528830 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -806,6 +806,7 @@ class acp_users
'S_USER_FOUNDER' => ($user_row['user_type'] == USER_FOUNDER) ? true : false,
'S_ACTION_OPTIONS' => $s_action_options,
'S_OWN_ACCOUNT' => ($user_id == $user->data['user_id']) ? true : false,
+ 'S_USER_INACTIVE' => ($user_row['user_type'] == USER_IGNORE || $user_row['user_type'] == USER_INACTIVE) ? true : false,
'U_SHOW_IP' => $this->u_action . "&amp;u=$user_id&amp;ip=" . (($ip == 'ip') ? 'hostname' : 'ip'),
'U_WHOIS' => $this->u_action . "&amp;action=whois&amp;user_ip={$user_row['user_ip']}",
@@ -924,7 +925,7 @@ class acp_users
$sql = 'SELECT lang_id
FROM ' . LANG_TABLE . "
- WHERE lang_iso = '" . $db->sql_escape($user_row['user_lang']) . "'";
+ WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);