diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-02-17 06:46:48 -0800 |
commit | 74472dc83ca897423c630dce0d1d7e3b13bb0b5f (patch) | |
tree | 4cac66304fcc8346ad238d2cda123160b65f3eb3 /modules/gallery/models | |
parent | eb1cdd037646b3697b64753652669fa9e25a5c8e (diff) | |
parent | 4ca55a90ee2f8e1d8595b0ec53a601d6c65475f6 (diff) |
Merge branch 'master' into talmdal_dev
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 283654c7..a64bcb49 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -931,13 +931,13 @@ 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(); + $data["fullsize_url"] = $this->abs_url(true); } - if ($tmp = $this->resize_url() && $this->is_photo()) { + if ($tmp = $this->resize_url(true) && $this->is_photo()) { $data["resize_url"] = $tmp; } - $data["thumb_url"] = $this->thumb_url(); + $data["thumb_url"] = $this->thumb_url(true); // Elide some internal-only data that is going to cause confusion in the client. foreach (array("relative_path_cache", "relative_url_cache", "left_ptr", "right_ptr", |