From 8c02f82246c8a991d795b4423f6d831e9e2f8807 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sun, 26 Jun 2011 14:59:32 +0200 Subject: Ignore warnings in the constructor of SimplePie_File This ignores warnings because of the (intentionally) missing url parameter for the constructor of SimplePie_File. --- inc/FeedParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc') 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); -- cgit v1.2.3 From 96569d486b765a54033635135007a20bc4368868 Mon Sep 17 00:00:00 2001 From: Matthias Schulte Date: Sun, 26 Jun 2011 16:54:34 +0200 Subject: The mail() function shouldn't be executed when no recipients are given. Empty to, cc or bcc fields could lead to an Internal Server Error: malformed header from script. Bad header=No recipient addresses found... --- inc/mail.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc') 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')){ -- cgit v1.2.3