diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/forms/photos/batch/edit.php | 1 | ||||
| -rw-r--r-- | views/default/js/photos/uploading.php | 3 | ||||
| -rw-r--r-- | views/default/object/image.php | 2 | ||||
| -rw-r--r-- | views/default/photos/group_module.php | 2 | ||||
| -rw-r--r-- | views/default/photos/tagging/tag.php | 2 | ||||
| -rw-r--r-- | views/default/river/object/image/tag.php | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/views/default/forms/photos/batch/edit.php b/views/default/forms/photos/batch/edit.php index fa017ac96..d843d8349 100644 --- a/views/default/forms/photos/batch/edit.php +++ b/views/default/forms/photos/batch/edit.php @@ -17,6 +17,7 @@ $images = elgg_get_entities_from_relationship(array( 'relationship' => 'belongs_to_batch', 'relationship_guid' => $batch->getGUID(), 'inverse_relationship' => true, + 'limit' => 0 )); echo '<ul>'; diff --git a/views/default/js/photos/uploading.php b/views/default/js/photos/uploading.php index 4330ae5ba..465f937ab 100644 --- a/views/default/js/photos/uploading.php +++ b/views/default/js/photos/uploading.php @@ -76,6 +76,9 @@ elgg.tidypics.uploading.init = function() { if (data.fileCount == 0) { $("#tidypics-upload-button").addClass('tidypics-disable'); } + }, + 'onError' : function (event, ID, fileObj, errorObj) { + // @todo do something useful with the limited information in the errorObj. } }); diff --git a/views/default/object/image.php b/views/default/object/image.php index 12d58440d..2aa76d48f 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -25,7 +25,7 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/lib/exif.php"; $image = $vars['entity']; $image_guid = $image->getGUID(); $tags = $image->tags; -$title = $image->title; +$title = $image->getTitle(); $desc = $image->description; $owner = $image->getOwnerEntity(); $friendlytime = friendly_time($image->time_created); 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( diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php index a59066c67..7e6f0313d 100644 --- a/views/default/river/object/image/tag.php +++ b/views/default/river/object/image/tag.php @@ -11,7 +11,7 @@ if ($annotation) { return; } - $image_title = $image->title; + $image_title = $image->getTitle(); } $tagger_link = "<a href=\"{$tagger->getURL()}\">$tagger->name</a>"; |