From d52699842f598d185b1388f4c6b72d2d63e21e64 Mon Sep 17 00:00:00 2001 From: trit Date: Wed, 23 Nov 2011 17:22:44 -0500 Subject: Switch disposition set to ternary operation --- system/libraries/Email.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'system/libraries') diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 3c679ce48..631b62e86 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -420,14 +420,9 @@ class CI_Email { */ public function attach($filename, $disposition = '', $newname = NULL) { - if(empty($disposition)) - { - $disposition = 'attachment'; - } - $this->_attach_name[] = array($filename, $newname); $this->_attach_type[] = $this->_mime_types(pathinfo($filename, PATHINFO_EXTENSION)); - $this->_attach_disp[] = $disposition; // Can also be 'inline' Not sure if it matters + $this->_attach_disp[] = empty($disposition) ? 'attachment' : $disposition; // Can also be 'inline' Not sure if it matters return $this; } -- cgit v1.2.3-24-g4f1b