diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-31 18:00:10 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-31 18:00:10 +0000 |
| commit | 2c470e4b27f4e5df4c996d6755ebbb1f7306d86a (patch) | |
| tree | 3a8748f72fcba6da3ba2bc9e0fbc047c71deadd7 /phpBB/includes/functions_messenger.php | |
| parent | 6aa42b69abe798388aad4f7e6bf943dfb608e896 (diff) | |
| download | forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.gz forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.bz2 forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.xz forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.zip | |
- added delete cookies link
- fixed global announcement links in viewforum
- do not display redirects in link forums as posts in forum overview
git-svn-id: file:///svn/phpbb/trunk@4904 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index cf500b4f51..71c775864f 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -428,6 +428,13 @@ class queue set_config('last_queue_run', time()); + // Delete stale lock file + if (file_exists($this->cache_file . '.lock') && !file_exists($this->cache_file)) + { + @unlink($this->cache_file . '.lock'); + return; + } + if (!file_exists($this->cache_file) || (file_exists($this->cache_file . '.lock') && filemtime($this->cache_file) > time() - $config['queue_interval'])) { return; @@ -1158,7 +1165,7 @@ function mail_encode($str, $encoding) // define start delimimter, end delimiter and spacer $end = "?="; - $start = "=?$this->encoding?B?"; + $start = "=?$encoding?B?"; $spacer = "$end\r\n $start"; // determine length of encoded text within chunks and ensure length is even |