aboutsummaryrefslogtreecommitdiff
path: root/pages/photos
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-04-13 16:35:22 -0700
committerBrett Profitt <brett.profitt@gmail.com>2012-04-13 16:35:22 -0700
commita965e8a7bb94d8ac870fd6b773a3aa7949db960a (patch)
treedc6304801ac375ec8be72ec761dab1ab67feb5e1 /pages/photos
parentd5ac522fcfd83c07c9eb879b6d7389be1b5c6dc2 (diff)
downloadelgg-a965e8a7bb94d8ac870fd6b773a3aa7949db960a.tar.gz
elgg-a965e8a7bb94d8ac870fd6b773a3aa7949db960a.tar.bz2
Using the original file name for photo title if none is specified.
Diffstat (limited to 'pages/photos')
-rw-r--r--pages/photos/album/sort.php2
-rw-r--r--pages/photos/batch/edit.php2
-rw-r--r--pages/photos/image/view.php8
3 files changed, 6 insertions, 6 deletions
diff --git a/pages/photos/album/sort.php b/pages/photos/album/sort.php
index a1d890be1..8b6d1bfc7 100644
--- a/pages/photos/album/sort.php
+++ b/pages/photos/album/sort.php
@@ -30,7 +30,7 @@ if (elgg_instanceof($owner, 'group')) {
} else {
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
}
-elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb(elgg_echo('album:sort'));
diff --git a/pages/photos/batch/edit.php b/pages/photos/batch/edit.php
index b96ddf408..ca9a55b18 100644
--- a/pages/photos/batch/edit.php
+++ b/pages/photos/batch/edit.php
@@ -29,7 +29,7 @@ $title = elgg_echo('tidypics:editprops');
elgg_push_breadcrumb(elgg_echo('photos'), "photos/all");
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
-elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb($title);
$content = elgg_view_form('photos/batch/edit', array(), array('batch' => $batch));
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
index 6db9ff529..6bd0257e0 100644
--- a/pages/photos/image/view.php
+++ b/pages/photos/image/view.php
@@ -36,8 +36,8 @@ if (elgg_instanceof($owner, 'group')) {
} else {
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
}
-elgg_push_breadcrumb($album->title, $album->getURL());
-elgg_push_breadcrumb($photo->title);
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
+elgg_push_breadcrumb($photo->getTitle());
if (elgg_get_plugin_setting('download_link', 'tidypics')) {
// add download button to title menu
@@ -54,11 +54,11 @@ $content = elgg_view_entity($photo, array('full_view' => true));
$body = elgg_view_layout('content', array(
'filter' => false,
'content' => $content,
- 'title' => $photo->title,
+ 'title' => $photo->getTitle(),
'sidebar' => elgg_view('tidypics/sidebar', array(
'page' => 'view',
'image' => $photo,
)),
));
-echo elgg_view_page($photo->title, $body);
+echo elgg_view_page($photo->getTitle(), $body);