aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/photos/admin/create_thumbnails.php2
-rw-r--r--actions/photos/album/sort.php2
-rw-r--r--actions/photos/image/tag.php2
-rw-r--r--classes/TidypicsImage.php6
-rw-r--r--pages/photos/album/sort.php2
-rw-r--r--pages/photos/batch/edit.php2
-rw-r--r--pages/photos/image/view.php8
-rw-r--r--start.php4
-rw-r--r--views/default/object/image.php2
-rw-r--r--views/default/river/object/image/tag.php2
10 files changed, 18 insertions, 14 deletions
diff --git a/actions/photos/admin/create_thumbnails.php b/actions/photos/admin/create_thumbnails.php
index f2e9b26e2..dfb5d4ed1 100644
--- a/actions/photos/admin/create_thumbnails.php
+++ b/actions/photos/admin/create_thumbnails.php
@@ -23,7 +23,7 @@ if (!$filename || !$container_guid) {
forward(REFERER);
}
-$title = $image->title;
+$title = $image->getTitle();
$prefix = "image/$container_guid/";
$filestorename = substr($filename, strlen($prefix));
diff --git a/actions/photos/album/sort.php b/actions/photos/album/sort.php
index 613747784..453f51ac5 100644
--- a/actions/photos/album/sort.php
+++ b/actions/photos/album/sort.php
@@ -14,5 +14,5 @@ $guids = explode(',', $guids);
$album->setImageList($guids);
-system_message(elgg_echo('tidypics:album:sorted', array($album->title)));
+system_message(elgg_echo('tidypics:album:sorted', array($album->getTitle())));
forward($album->getURL()); \ No newline at end of file
diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php
index 20f476944..e623bd546 100644
--- a/actions/photos/image/tag.php
+++ b/actions/photos/image/tag.php
@@ -92,7 +92,7 @@ if ($annotation_id) {
elgg_echo('tidypics:tag:subject'),
sprintf(
elgg_echo('tidypics:tag:body'),
- $image->title,
+ $image->getTitle(),
$tagger->name,
$image->getURL()
)
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index dd4324468..26a3483a9 100644
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -90,7 +90,11 @@ class TidypicsImage extends ElggFile {
* @return string
*/
public function getTitle() {
- return $this->title;
+ if ($this->title) {
+ return $this->title;
+ } else {
+ return $this->originalfilename;
+ }
}
/**
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);
diff --git a/start.php b/start.php
index 2ef7dcb4c..c56382655 100644
--- a/start.php
+++ b/start.php
@@ -423,14 +423,14 @@ function tidypics_notify_message($hook, $type, $result, $params) {
if ($entity->first_upload) {
$descr = $entity->description;
- $title = $entity->title;
+ $title = $entity->getTitle();
$owner = $entity->getOwnerEntity();
return elgg_echo('tidypics:newalbum', array($owner->name))
. ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
} else {
if ($entity->shouldNotify()) {
$descr = $entity->description;
- $title = $entity->title;
+ $title = $entity->getTitle();
$owner = $entity->getOwnerEntity();
return elgg_echo('tidypics:updatealbum', array($owner->name, $title)) . ': ' . $entity->getURL();
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/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>";