diff options
author | Andy Staudacher <andy.st@gmail.com> | 2010-02-21 13:08:06 -0800 |
---|---|---|
committer | Andy Staudacher <andy.st@gmail.com> | 2010-02-21 13:08:06 -0800 |
commit | be20309259de9310da3be703c93c4e42def2541b (patch) | |
tree | 38ecbb4fe4183e65af79cd9fbdfae3d99b8cd4d3 /modules/gallery/models | |
parent | cb57c3912aef6bed394a4693f94e9c97001aff34 (diff) | |
parent | 1377b2c7b3110a132d4b2d748be72a6aafa537e6 (diff) |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery/models')
-rw-r--r-- | modules/gallery/models/item.php | 6 |
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); |