Merge branch 'master' into talmdal_dev

1 files changed, 11 insertions, 1 deletions

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index dbd56fa2..283654c7 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -930,8 +930,18 @@ 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();
+    }
+
+    if ($tmp = $this->resize_url()  && $this->is_photo()) {
+      $data["resize_url"] = $tmp;
+    }
+    $data["thumb_url"] = $this->thumb_url();
+
     // 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") as $key) {
+    foreach (array("relative_path_cache", "relative_url_cache", "left_ptr", "right_ptr",
+                   "thumb_dirty", "resize_dirty") as $key) {
       unset($data[$key]);
     }
     return $data;