diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:17:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:17:06 +0000 |
| commit | 1a18e36684d74d5a0c2538805a3ff8436036189e (patch) | |
| tree | 4876dd53349c44f7df2809370fdcdf1aef71c6c6 /phpBB/includes/functions_messenger.php | |
| parent | 58d146cac61a8c574346ee794a04bdfeaab9215d (diff) | |
| download | forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.gz forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.bz2 forums-1a18e36684d74d5a0c2538805a3ff8436036189e.tar.xz forums-1a18e36684d74d5a0c2538805a3ff8436036189e.zip | |
- add even more bugs to the codebase
- changed submit_pm to carry on the from userdata
git-svn-id: file:///svn/phpbb/trunk@5241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index e9973f9b02..efe388cc85 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -228,7 +228,7 @@ class messenger global $user, $phpEx, $phpbb_root_path; // Session doesn't exist, create it - $user->start(); + $user->session_begin(); include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx); add_log('critical', 'LOG_' . $type . '_ERROR', $msg); @@ -472,7 +472,12 @@ class queue foreach ($this->queue_data as $object => $data_ary) { - @set_time_limit(60); + @set_time_limit(0); + + if (!isset($data_ary['package_size'])) + { + $data_ary['package_size'] = 0; + } $package_size = $data_ary['package_size']; $num_items = (sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size; @@ -798,7 +803,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $encoding, $headers // We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here. if (!$rcpt) { - $user->start(); + $user->session_begin(); $err_msg .= '<br /><br />' . sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address)); $smtp->close_session(); return false; |