makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Missing UCP language string, some small activation issues on adm/index.php

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5090 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt 2005-02-02 13:14:46 +00:00
parent 57a9f3f8db
commit 9841f6145c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/adm/index.php
View file

@ -148,11 +148,11 @@ elseif ($pane == 'right')
if (!$delete) if (!$delete)
{ {
set_config('num_users', $config['num_users'] + $db->affected_rows(), true); set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true);
} }
$log_action = ($activate) ? 'log_index_activate' : 'log_index_delete'; $log_action = ($activate) ? 'log_index_activate' : 'log_index_delete';
add_log('admin', $log_action, $db->affected_rows()); add_log('admin', $log_action, $db->sql_affectedrows());
break; break;
case 'remind': case 'remind':
@ -166,7 +166,7 @@ elseif ($pane == 'right')
trigger_error($user->lang['EMAIL_DISABLED']); trigger_error($user->lang['EMAIL_DISABLED']);
} }
$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_method, user_regdate, user_actkey $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey
FROM ' . USERS_TABLE . " FROM ' . USERS_TABLE . "
WHERE user_id IN ($mark)"; WHERE user_id IN ($mark)";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -205,7 +205,11 @@ elseif ($pane == 'right')
} }
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
$messenger->queue->save(); if ($messenger->queue)
{
$messenger->queue->save();
}
unset($email_list); unset($email_list);
add_log('admin', 'LOG_INDEX_REMIND', implode(', ', $usernames)); add_log('admin', 'LOG_INDEX_REMIND', implode(', ', $usernames));
@ -705,4 +709,4 @@ else
exit; exit;
} }
?> ?>

3
phpBB/language/en/ucp.php
View file

@ -341,6 +341,7 @@ $lang += array(
'UCP_AVATAR' => 'Your avatar', 'UCP_AVATAR' => 'Your avatar',
'UCP_PROFILE_INFO' => 'Your Profile', 'UCP_PROFILE_INFO' => 'Your Profile',
'UCP_REG_DETAILS' => 'Registration details', 'UCP_REG_DETAILS' => 'Registration details',
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
'UCP_SIGNATURE' => 'Your signature', 'UCP_SIGNATURE' => 'Your signature',
'UCP_REMIND' => 'Send password', 'UCP_REMIND' => 'Send password',
'UCP_WATCHED' => 'Watched items', 'UCP_WATCHED' => 'Watched items',
@ -446,4 +447,4 @@ $lang += array(
'JOIN_MARKED' => 'Join marked', 'JOIN_MARKED' => 'Join marked',
); );
?> ?>