aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-12-17 14:36:08 -0500
committerBrett Profitt <brett.profitt@gmail.com>2012-12-17 14:36:08 -0500
commit93170dd8fb02fd2adb691c34742ca1e47d21c14d (patch)
treea4b585877a3018e109f584a2f9777c79e6c33fed /engine/lib
parentb46d3d3699529b49e147843437148baac6657f39 (diff)
downloadelgg-93170dd8fb02fd2adb691c34742ca1e47d21c14d.tar.gz
elgg-93170dd8fb02fd2adb691c34742ca1e47d21c14d.tar.bz2
Fixes #4709. Removed documentation for unused annotation_id(s) in egef_annotations().
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/annotations.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 2036ccd61..3b9f84703 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -316,8 +316,6 @@ function elgg_list_annotations($options) {
*
* annotation_owner_guids => NULL|ARR guids for annotaiton owners
*
- * annotation_ids => NULL|ARR Annotation IDs
- *
* @return mixed If count, int. If not count, array. false on errors.
* @since 1.7.0
*/
@@ -336,8 +334,6 @@ function elgg_get_entities_from_annotations(array $options = array()) {
'annotation_owner_guids' => ELGG_ENTITIES_ANY_VALUE,
- 'annotation_ids' => ELGG_ENTITIES_ANY_VALUE,
-
'order_by' => 'maxtime desc',
'group_by' => 'a.entity_guid'
);
@@ -345,12 +341,13 @@ function elgg_get_entities_from_annotations(array $options = array()) {
$options = array_merge($defaults, $options);
$singulars = array('annotation_name', 'annotation_value',
- 'annotation_name_value_pair', 'annotation_owner_guid', 'annotation_id');
+ 'annotation_name_value_pair', 'annotation_owner_guid');
$options = elgg_normalise_plural_options_array($options, $singulars);
+ $options = elgg_entities_get_metastrings_options('annotation', $options);
- if (!$options = elgg_entities_get_metastrings_options('annotation', $options)) {
- return FALSE;
+ if (!$options) {
+ return false;
}
// special sorting for annotations