aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/elgglib.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-28 18:43:39 +0200
committerSem <sembrestels@riseup.net>2012-08-28 18:43:39 +0200
commitf3f3561b7ce6462e4f75649bab874b3112867dc3 (patch)
treed017b2d5aff45549d2a08c2558553c51edb10a83 /engine/lib/elgglib.php
parentafa701d29525b8ebd3782d3efa6838c14ff9cc54 (diff)
parent9ccbd106a87a1742a61cc4df0e9ead921046772a (diff)
downloadelgg-f3f3561b7ce6462e4f75649bab874b3112867dc3.tar.gz
elgg-f3f3561b7ce6462e4f75649bab874b3112867dc3.tar.bz2
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'engine/lib/elgglib.php')
-rw-r--r--engine/lib/elgglib.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 3026a78e3..554b0561f 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1575,7 +1575,7 @@ function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset
* @param bool $strict Return array key if it's set, even if empty. If false,
* return $default if the array key is unset or empty.
*
- * @return void
+ * @return mixed
* @since 1.8.0
*/
function elgg_extract($key, array $array, $default = null, $strict = true) {