aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/elgglib.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-23 09:16:22 -0400
committerCash Costello <cash.costello@gmail.com>2012-06-23 09:16:22 -0400
commit8fd511bcd35646c64658f63cfd35f4b0fb3541a8 (patch)
tree7a736385f238d1bf2a5447c40c996e5fd3cb19a6 /engine/lib/elgglib.php
parentffd992ae30c58acd60ccd1f536a5000982fc4745 (diff)
downloadelgg-8fd511bcd35646c64658f63cfd35f4b0fb3541a8.tar.gz
elgg-8fd511bcd35646c64658f63cfd35f4b0fb3541a8.tar.bz2
Fixes #4168 returning default value from elgg_extract if non-array passed - not removing type hint since we downgraded it from an error to a warning
Diffstat (limited to 'engine/lib/elgglib.php')
-rw-r--r--engine/lib/elgglib.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 65666954c..9aad2a5bd 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1578,7 +1578,11 @@ function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset
* @return void
* @since 1.8.0
*/
-function elgg_extract($key, array $array, $default = NULL, $strict = true) {
+function elgg_extract($key, array $array, $default = null, $strict = true) {
+ if (!is_array($array)) {
+ return $default;
+ }
+
if ($strict) {
return (isset($array[$key])) ? $array[$key] : $default;
} else {