aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/annotations.php
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2013-05-30 21:04:09 -0400
committercash <cash.costello@gmail.com>2013-05-30 21:04:09 -0400
commitbbf99434e13ebf304fb15a8c5b9d70c621f38c86 (patch)
treea3163ae4df9c24f00fda3ac118826dbce3545516 /engine/lib/annotations.php
parenta9709da4bd45ea04944d93e0d472aa4ee801e0f5 (diff)
downloadelgg-bbf99434e13ebf304fb15a8c5b9d70c621f38c86.tar.gz
elgg-bbf99434e13ebf304fb15a8c5b9d70c621f38c86.tar.bz2
Fixes #5564 count works with elgg_get_entities_from_annotation_calculation()
Diffstat (limited to 'engine/lib/annotations.php')
-rw-r--r--engine/lib/annotations.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 81755f169..124e67e0f 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -419,8 +419,8 @@ function elgg_list_entities_from_annotations($options = array()) {
function elgg_get_entities_from_annotation_calculation($options) {
$db_prefix = elgg_get_config('dbprefix');
$defaults = array(
- 'calculation' => 'sum',
- 'order_by' => 'annotation_calculation desc'
+ 'calculation' => 'sum',
+ 'order_by' => 'annotation_calculation desc'
);
$options = array_merge($defaults, $options);
@@ -457,6 +457,12 @@ function elgg_get_entities_from_annotation_calculation($options) {
* @return string
*/
function elgg_list_entities_from_annotation_calculation($options) {
+ $defaults = array(
+ 'calculation' => 'sum',
+ 'order_by' => 'annotation_calculation desc'
+ );
+ $options = array_merge($defaults, $options);
+
return elgg_list_entities($options, 'elgg_get_entities_from_annotation_calculation');
}