mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
some further fixes
- re-introduce grabbing random number from /dev/urandom git-svn-id: file:///svn/phpbb/trunk@8241 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -165,12 +165,7 @@ class messenger
|
||||
|
||||
if (!file_exists($tpl_file))
|
||||
{
|
||||
$tpl_file = "{$phpbb_root_path}language/$template_lang/email/$template_file.txt";
|
||||
|
||||
if (!file_exists($tpl_file))
|
||||
{
|
||||
trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR);
|
||||
}
|
||||
trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR);
|
||||
}
|
||||
|
||||
if (($data = @file_get_contents($tpl_file)) === false)
|
||||
@@ -607,7 +602,7 @@ class queue
|
||||
continue 2;
|
||||
}
|
||||
|
||||
include_once($phpbb_root_path . 'includes/functions_jabber.'.$phpEx);
|
||||
include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx);
|
||||
$this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']);
|
||||
|
||||
if (!$this->jabber->connect())
|
||||
|
Reference in New Issue
Block a user