mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
We're going down, we're going down, blurp, blurp, gurgle, gurgle
git-svn-id: file:///svn/phpbb/trunk@4660 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
947f0d6c19
commit
eb87d0537a
3 changed files with 2 additions and 4 deletions
|
@ -225,7 +225,6 @@ function discover_auth($user_id = false, $opts = false, $forum_id = false)
|
|||
FROM ' . ACL_OPTIONS_TABLE . ' ao, ' . ACL_USERS_TABLE . ' a
|
||||
WHERE ao.auth_option_id = a.auth_option_id
|
||||
' . (($sql_user) ? 'AND a.' . $sql_user : '') . "
|
||||
$sql_user
|
||||
$sql_forum
|
||||
$sql_opts
|
||||
ORDER BY a.forum_id, ao.auth_option";
|
||||
|
@ -243,7 +242,6 @@ function discover_auth($user_id = false, $opts = false, $forum_id = false)
|
|||
WHERE ao.auth_option_id = a.auth_option_id
|
||||
AND a.group_id = ug.group_id
|
||||
' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
|
||||
$sql_users
|
||||
$sql_forum
|
||||
$sql_opts
|
||||
ORDER BY a.forum_id, ao.auth_option";
|
||||
|
|
|
@ -136,7 +136,7 @@ class ucp_profile extends module
|
|||
$messenger->assign_vars(array(
|
||||
'USERNAME' => $row['username'],
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey")
|
||||
);
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ class ucp_zebra extends module
|
|||
|
||||
if ($add)
|
||||
{
|
||||
$sql = 'SELECT user_id, user_permissions
|
||||
$sql = 'SELECT user_id
|
||||
FROM ' . USERS_TABLE . '
|
||||
WHERE username IN (' . $add . ')';
|
||||
$result = $db->sql_query($sql);
|
||||
|
|
Loading…
Add table
Reference in a new issue