summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-02-21 14:41:05 -0800
committerTim Almdal <tnalmdal@shaw.ca>2010-02-21 14:41:05 -0800
commit9f810150532a2511bfc5f03c9d24fd592d2f803f (patch)
tree7e4c1d8547b1eb3977f5b634270d51334f4fe910 /modules/gallery/models
parenta6c3e8f0a26661afd353c75bea496532999f2ca5 (diff)
parentbe20309259de9310da3be703c93c4e42def2541b (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index a64bcb49..d747b84d 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -930,11 +930,11 @@ class Item_Model extends ORM_MPTT {
}
unset($data["album_cover_item_id"]);
- if (access::can("view_fillsize", $this) && $this->is_photo()) {
- $data["fullsize_url"] = $this->abs_url(true);
+ if (access::can("view_full", $this) && $this->is_photo()) {
+ $data["file_url"] = $this->file_url(true);
}
- if ($tmp = $this->resize_url(true) && $this->is_photo()) {
+ if (($tmp = $this->resize_url(true)) && $this->is_photo()) {
$data["resize_url"] = $tmp;
}
$data["thumb_url"] = $this->thumb_url(true);