From e76309360966e272d7d601620efade95c26feeee Mon Sep 17 00:00:00 2001 From: Sven Rymenants Date: Wed, 18 Apr 2018 21:10:45 +0200 Subject: [PATCH] Fixes attachments, remove findfile to allow autoloader in different modules --- classes/Kohana/Email.php | 4 ++-- init.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/Kohana/Email.php b/classes/Kohana/Email.php index 49f7778..89cb4a9 100644 --- a/classes/Kohana/Email.php +++ b/classes/Kohana/Email.php @@ -495,11 +495,11 @@ public function send($to = FALSE, $from = FALSE, $subject = FALSE, $body = FALSE if (is_string($attachment)) { - $this->attach($attachment); + $this->attach_content($attachment); } elseif (is_array($attachment)) { - $this->attach($attachment['file'], $attachment['name']); + $this->attach_content($attachment['file'], $attachment['name']); } } diff --git a/init.php b/init.php index 1af59a9..029056c 100644 --- a/init.php +++ b/init.php @@ -1,4 +1,3 @@