diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-01-24 22:37:20 +0100 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-01-24 22:37:20 +0100 |
commit | 8f9e93dd37ae0090c9b4117138cd3135bfe3f67a (patch) | |
tree | 3f49040d696e760381642f2d2ffa407cee1dc039 /system/helpers/email_helper.php | |
parent | de15a0b7377db0ef3b1d43508401be3c2927c0ff (diff) | |
parent | 96db8f91c34c18119548cacc4692362f51e70407 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/helpers/email_helper.php')
-rw-r--r-- | system/helpers/email_helper.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php index 22099e58a..f184031a9 100644 --- a/system/helpers/email_helper.php +++ b/system/helpers/email_helper.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -49,7 +49,7 @@ if ( ! function_exists('valid_email')) { function valid_email($address) { - return ( ! preg_match("/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix", $address)) ? FALSE : TRUE; + return (bool) preg_match('/^([a-z0-9\+_\-]+)(\.[a-z0-9\+_\-]+)*@([a-z0-9\-]+\.)+[a-z]{2,6}$/ix', $address); } } @@ -69,6 +69,5 @@ if ( ! function_exists('send_email')) } } - /* End of file email_helper.php */ -/* Location: ./system/helpers/email_helper.php */
\ No newline at end of file +/* Location: ./system/helpers/email_helper.php */ |