Fixes attachments, remove findfile to allow autoloader in different m…

…odules
svenbw · Apr 18, 2018 · e763093 · e763093
1 parent 4100e11
commit e763093
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 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']);
       }
     }
 

diff --git a/init.php b/init.php
@@ -1,4 +1,3 @@
 <?php
 
-// Load mailers trough composer autoload
-require_once Kohana::find_file('vendor', 'autoload');
+require_once 'vendor/autoload.php';