Encode_file is for internal use only.

huglester · Oct 23, 2011 · 030c6b3 · 030c6b3
1 parent b940d3e
commit 030c6b3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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))
 		{