diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-08 18:08:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-08 18:08:54 +0000 |
| commit | 2155bbbf8a16510548b2eaf86c1bb4cd52083672 (patch) | |
| tree | e834ffce6c79762d5f71e1df31468b5c6cfd30ea | |
| parent | a97b5f5ed83ba6798b550ab2d54b21f86fcf96f3 (diff) | |
| download | forums-2155bbbf8a16510548b2eaf86c1bb4cd52083672.tar forums-2155bbbf8a16510548b2eaf86c1bb4cd52083672.tar.gz forums-2155bbbf8a16510548b2eaf86c1bb4cd52083672.tar.bz2 forums-2155bbbf8a16510548b2eaf86c1bb4cd52083672.tar.xz forums-2155bbbf8a16510548b2eaf86c1bb4cd52083672.zip | |
Erm, yes, we use EOL in queue too. :/ (me is ashamed). Paul, thanks for giving me access to debug this.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9429 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f014e2ac67..866acc7f1a 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -549,6 +549,7 @@ class queue var $queue_data = array(); var $package_size = 0; var $cache_file = ''; + var $eol = "\n"; /** * constructor @@ -559,6 +560,10 @@ class queue $this->data = array(); $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx"; + + // Determine EOL character (\n for UNIX, \r\n for Windows and \r for Mac) + $this->eol = (!defined('PHP_EOL')) ? (($eol = strtolower(substr(PHP_OS, 0, 3))) == 'win') ? "\r\n" : (($eol == 'mac') ? "\r" : "\n") : PHP_EOL; + $this->eol = (!$this->eol) ? "\n" : $this->eol; } /** |