diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-06-28 15:54:18 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-06-28 15:54:18 +0300 |
| commit | e18ba5797b635bf97755910093c3eed1f9667362 (patch) | |
| tree | cf6fd41758cf814d96222d74a37def8787f888be /inc | |
| parent | 322111f0870d88a59b71258ce8410ae378441533 (diff) | |
| parent | a4f16859d7e91bb129edd3be5c62177d56030981 (diff) | |
| download | rpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.gz rpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/FeedParser.php | 2 | ||||
| -rw-r--r-- | inc/mail.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/inc/FeedParser.php b/inc/FeedParser.php index b98350da7..235bed46e 100644 --- a/inc/FeedParser.php +++ b/inc/FeedParser.php @@ -49,7 +49,7 @@ class FeedParser_File extends SimplePie_File { */ function FeedParser_File($url, $timeout=10, $redirects=5, $headers=null, $useragent=null, $force_fsockopen=false) { - parent::__construct(); + @parent::__construct(); $this->http = new DokuHTTPClient(); $this->success = $this->http->sendRequest($url); diff --git a/inc/mail.php b/inc/mail.php index 8742e17f6..01b2895e1 100644 --- a/inc/mail.php +++ b/inc/mail.php @@ -104,6 +104,9 @@ function _mail_send_action($data) { $headers = isset($data['headers']) ? $data['headers'] : null; $params = isset($data['params']) ? $data['params'] : null; + // discard mail request if no recipients are available + if(trim($to) === '' && trim($cc) === '' && trim($bcc) === '') return false; + // end additional code to support event ... original mail_send() code from here if(defined('MAILHEADER_ASCIIONLY')){ |