summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-02 13:58:54 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-02 13:58:54 +0200
commitd66872ae5d7cd4d2b531251a9c63528e81af3322 (patch)
tree4ed76ac11914b22e2aa9d43f65db6f27b1b7bd7a /system/helpers
parentf00b9f02425afc902d79209c108ae74ab73342c9 (diff)
parentfac3761c6a01a12457c61cd4e3b17dba5ee26bf7 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_subdrivers
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/array_helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index 6a7c8e3c7..216f12e56 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -50,7 +50,7 @@ if ( ! function_exists('element'))
* @param mixed
* @return mixed depends on what the array contains
*/
- function element($item, $array, $default = FALSE)
+ function element($item, $array, $default = NULL)
{
return empty($array[$item]) ? $default : $array[$item];
}
@@ -87,7 +87,7 @@ if ( ! function_exists('elements'))
* @param mixed
* @return mixed depends on what the array contains
*/
- function elements($items, $array, $default = FALSE)
+ function elements($items, $array, $default = NULL)
{
$return = array();