diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:36 +0100 |
| commit | 1ceddd9eeccde56ab307631a16e40b943eac883a (patch) | |
| tree | d1045042f004c0d551658e8192b75965139f3707 /phpBB/includes/functions_messenger.php | |
| parent | 0e0c8d78199cfa2dd56a62266df33655c93367ff (diff) | |
| parent | aadda939732ee163c3babedf4afcd914af12a2cc (diff) | |
| download | forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.gz forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.bz2 forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.xz forums-1ceddd9eeccde56ab307631a16e40b943eac883a.zip | |
Merge commit 'release-3.0-RC3'
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 26ff1491fb..b2cb5ec054 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -52,7 +52,7 @@ class messenger $this->addresses['to'][$pos]['email'] = trim($address); // If empty sendmail_path on windows, PHP changes the to line - if (!$config['smtp_delivery'] && strpos(strtolower(PHP_OS), 'win') === 0) + if (!$config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\') { $this->addresses['to'][$pos]['name'] = ''; } @@ -556,6 +556,7 @@ class queue $fp = @fopen($this->cache_file . '.lock', 'wb'); fclose($fp); + @chmod($this->cache_file . '.lock', 0666); include($this->cache_file); @@ -683,6 +684,8 @@ class queue fwrite($fp, "<?php\n\$this->queue_data = " . var_export($this->queue_data, true) . ";\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_file, 0666); } } @@ -722,6 +725,8 @@ class queue fwrite($fp, "<?php\n\$this->queue_data = " . var_export($this->data, true) . ";\n?>"); @flock($fp, LOCK_UN); fclose($fp); + + @chmod($this->cache_file, 0666); } } } |