diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-07-14 08:10:28 -0400 |
| commit | 4761adf8eee9feadd77599682ef192b56520d11d (patch) | |
| tree | 022a921d20ddd26fb226351cadedf9a8dfe9e971 /views/default/photos | |
| parent | 4448f072dc6149a62b602e60e766fd00c2b6af89 (diff) | |
| parent | c1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d (diff) | |
| download | elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.gz elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.bz2 | |
Pulling in several small fixes from Brett's fork
Diffstat (limited to 'views/default/photos')
| -rw-r--r-- | views/default/photos/group_module.php | 2 | ||||
| -rw-r--r-- | views/default/photos/tagging/tag.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/views/default/photos/group_module.php b/views/default/photos/group_module.php index aa0e7b3ff..de7a451c4 100644 --- a/views/default/photos/group_module.php +++ b/views/default/photos/group_module.php @@ -3,7 +3,7 @@ * Group blog module */ -$group = elgg_get_page_owner_entity(); +$group = $vars['entity']; if ($group->photos_enable == "no") { return true; diff --git a/views/default/photos/tagging/tag.php b/views/default/photos/tagging/tag.php index 6f6af968a..6bdc0db02 100644 --- a/views/default/photos/tagging/tag.php +++ b/views/default/photos/tagging/tag.php @@ -29,7 +29,7 @@ if ($vars['tag']->type == 'user') { } $delete = ''; -$annotation = get_annotation($vars['tag']->annotation_id); +$annotation = elgg_get_annotation_from_id($vars['tag']->annotation_id); if ($annotation->canEdit()) { $url = elgg_http_add_url_query_elements('action/photos/image/untag', array( |