From 1ffc081d2cffd228b99a39ef6dc0393c8473d533 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Thu, 7 Jun 2007 20:42:03 +0000 Subject: [PATCH 1/1] Clean params to remove empty strings and fix the default checkCancel implementation git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@263 9869982d-c50d-0410-be91-f2a2ec7c7c7b --- banana/banana.inc.php.in | 5 +++++ banana/message.inc.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index e3c16ef..34ae838 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -193,6 +193,11 @@ class Banana */ protected function loadParams() { + foreach ($this->params as &$value) { + if ($value === "") { + $value = null; + } + } Banana::$group = isset($this->params['group']) ? $this->params['group'] : null; Banana::$artid = isset($this->params['artid']) ? $this->params['artid'] : null; Banana::$first = isset($this->params['first']) ? $this->params['first'] : null; diff --git a/banana/message.inc.php b/banana/message.inc.php index 56885f7..5caa802 100644 --- a/banana/message.inc.php +++ b/banana/message.inc.php @@ -303,7 +303,7 @@ final class BananaMessage extends BananaMimePart if (function_exists('hook_checkcancel')) { return hook_checkcancel($this->headers); } - return Banana::$profile['name'] == $this->headers['from']; + return Banana::$profile['headers']['From'] == $this->headers['from']; } public function canSend() -- 2.1.4