From 030c6b3f49e446fa9c34c6bff1ebdaf1a0115c84 Mon Sep 17 00:00:00 2001 From: Frank de Jonge Date: Sun, 23 Oct 2011 22:10:29 +0200 Subject: [PATCH] Encode_file is for internal use only. --- classes/email/driver.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/email/driver.php b/classes/email/driver.php index c6d4fdf..2e543a7 100644 --- a/classes/email/driver.php +++ b/classes/email/driver.php @@ -212,7 +212,7 @@ public function html_body($html, $generate_alt = null, $auto_attach = null) */ public function subject($subject) { - $this->subject = $subject; + $this->subject = (string) $subject; return $this; } @@ -414,6 +414,7 @@ protected function clear_reply_to() * @param bool $inline whether to include the file inline * @param string $mime the file's mime-type * @param string $mime the file's mime-type + * @return object $this */ public function attach($file, $inline = false, $cid = null, $mime = null) { @@ -502,7 +503,7 @@ public function string_attach($contents, $filename, $cid = null, $inline = false * @param string $encoding the encoding * @retun string the encoded file data */ - public static function encode_file($file, $newline, $length = 76) + protected static function encode_file($file, $newline, $length = 76) { if (($contents = file_get_contents($file)) === false or empty($contents)) {