diff options
| author | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
|---|---|---|
| committer | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
| commit | 3978fc33d82dd7f778d1adbf30744f4dfac41c25 (patch) | |
| tree | f32be1ae610f0cfeff65c35abecd14e8ea5cadc6 /system/helpers/email_helper.php | |
| parent | 275cf274860c6ed181d50b398efd3a21d7ba9135 (diff) | |
| parent | a9ab46d7a031bda304eb9b6658ffaf693b8d9bcb (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
user_guide_src/source/changelog.rst
Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
Diffstat (limited to 'system/helpers/email_helper.php')
| -rw-r--r-- | system/helpers/email_helper.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php index 2a63b36c9..dfb166a5a 100644 --- a/system/helpers/email_helper.php +++ b/system/helpers/email_helper.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php /** * CodeIgniter * @@ -24,6 +24,7 @@ * @since Version 1.0 * @filesource */ +defined('BASEPATH') OR exit('No direct script access allowed'); /** * CodeIgniter Email Helpers @@ -42,7 +43,8 @@ if ( ! function_exists('valid_email')) /** * Validate email address * - * @param string + * @deprecated 3.0.0 Use PHP's filter_var() instead + * @param string $email * @return bool */ function valid_email($email) @@ -58,12 +60,13 @@ if ( ! function_exists('send_email')) /** * Send an email * - * @param string - * @param string - * @param string + * @deprecated 3.0.0 Use PHP's mail() instead + * @param string $recipient + * @param string $subject + * @param string $message * @return bool */ - function send_email($recipient, $subject = 'Test email', $message = 'Hello World') + function send_email($recipient, $subject, $message) { return mail($recipient, $subject, $message); } |