Merge branch 'master' into master

svenbw · Apr 18, 2018 · 1d26d7b · 1d26d7b
2 parents ffcdf8f + 6426a6d
commit 1d26d7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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']);
       }
     }