1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

Merge PR #893 branch 'nickvergessen/ticket/10184' into develop-olympus

* nickvergessen/ticket/10184:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
This commit is contained in:
Oleg Pudeyev 2012-12-01 04:55:00 -05:00
commit ae14ac7ba9
2 changed files with 21 additions and 0 deletions

View File

@ -2171,6 +2171,26 @@ function change_database_data(&$no_updates, $version)
} }
} }
// Disable receiving pms for bots
$sql = 'SELECT user_id
FROM ' . BOTS_TABLE;
$result = $db->sql_query($sql);
$bot_user_ids = array();
while ($row = $db->sql_fetchrow($result))
{
$bot_user_ids[] = (int) $row['user_id'];
}
$db->sql_freeresult($result);
if (!empty($bot_user_ids))
{
$sql = 'UPDATE ' . USERS_TABLE . '
SET user_allow_pm = 0
WHERE ' . $db->sql_in_set('user_id', $bot_user_ids);
_sql($sql, $errored, $error_ary);
}
$no_updates = false; $no_updates = false;
break; break;
} }

View File

@ -1859,6 +1859,7 @@ class install_install extends module
'user_timezone' => 0, 'user_timezone' => 0,
'user_dateformat' => $lang['default_dateformat'], 'user_dateformat' => $lang['default_dateformat'],
'user_allow_massemail' => 0, 'user_allow_massemail' => 0,
'user_allow_pm' => 0,
); );
$user_id = user_add($user_row); $user_id = user_add($user_row);