From a965e8a7bb94d8ac870fd6b773a3aa7949db960a Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Fri, 13 Apr 2012 16:35:22 -0700
Subject: Using the original file name for photo title if none is specified.

---
 pages/photos/album/sort.php | 2 +-
 pages/photos/batch/edit.php | 2 +-
 pages/photos/image/view.php | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pages/photos')

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);
-- 
cgit v1.2.3