aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/annotations.php
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-09-29 19:49:01 -0400
committercash <cash.costello@gmail.com>2011-09-29 19:49:01 -0400
commit1e3c1afcacac23f4f7d34657dce6ba462b7ed97e (patch)
treec7637ecdb84e0b190cccdc3232edd818a54869e3 /engine/lib/annotations.php
parenta458ae4e0f8e5b19884860fead6e5f901b95eca4 (diff)
downloadelgg-1e3c1afcacac23f4f7d34657dce6ba462b7ed97e.tar.gz
elgg-1e3c1afcacac23f4f7d34657dce6ba462b7ed97e.tar.bz2
Fixes #3827 updated documentation on @return for elgg_get_entities* functions
Diffstat (limited to 'engine/lib/annotations.php')
-rw-r--r--engine/lib/annotations.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 80ffbe74e..9ab5a1b39 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -285,14 +285,12 @@ function elgg_list_annotations($options) {
*/
/**
- * Returns entities based upon annotations. Accepts the same values as
- * elgg_get_entities_from_metadata() but uses the annotations table.
+ * Returns entities based upon annotations. Also accepts all options available
+ * to elgg_get_entities() and elgg_get_entities_from_metadata().
*
- * NB: Entity creation time is selected as max_time. To sort based upon
+ * Entity creation time is selected as max_time. To sort based upon
* this, pass 'order_by' => 'maxtime asc' || 'maxtime desc'
*
- * time_created in this case will be the time the annotation was created.
- *
* @see elgg_get_entities
* @see elgg_get_entities_from_metadata
*
@@ -321,7 +319,7 @@ function elgg_list_annotations($options) {
*
* annotation_ids => NULL|ARR Annotation IDs
*
- * @return array
+ * @return mixed int if count is true, an array of entity objects, or false on failure
* @since 1.7.0
*/
function elgg_get_entities_from_annotations(array $options = array()) {