aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorKevin Jardine <kevinjardine@yahoo.com>2012-05-10 17:31:28 +0200
committerKevin Jardine <kevinjardine@yahoo.com>2012-05-10 17:31:28 +0200
commitdb347db3a2cedcfafaffba7fe220f34a33effd87 (patch)
treec7413c7bb67ed0e86593b26082f8831f3f33a199 /models
parent0f849b3526483df26b2228a51c1032c8504d64a1 (diff)
downloadelgg-db347db3a2cedcfafaffba7fe220f34a33effd87.tar.gz
elgg-db347db3a2cedcfafaffba7fe220f34a33effd87.tar.bz2
attempt to revive add_to_group feature
Diffstat (limited to 'models')
-rw-r--r--models/model.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/models/model.php b/models/model.php
index 287adee54..042d21736 100644
--- a/models/model.php
+++ b/models/model.php
@@ -970,7 +970,17 @@ $count = false, $region='-', $meta_max = '', $annotation_name = '')
if ($limit) {
$query .= " limit $offset, $limit"; // Add order and limit
}
- return get_data($query, "entity_row_to_elggstar");
+ $entities = get_data($query, "entity_row_to_elggstar");
+ if (elgg_get_plugin_setting('add_to_group_calendar', 'event_calendar') == 'yes') {
+ if (get_entity($container_guid) instanceOf ElggGroup) {
+ $entities = event_calendar_get_entities_from_metadata_between_related($meta_start_name, $meta_end_name,
+ $meta_start_value, $meta_end_value, $entity_type,
+ $entity_subtype, $owner_guid, $container_guid,
+ 0, 0, "", 0,
+ false, false, '-',$entities);
+ }
+ }
+ return $entities;
} else {
if ($row = get_data_row($query))
return $row->total;