Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/models/item.php

1 files changed, 7 insertions, 4 deletions

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index a2271b59..dfeab9fc 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -92,19 +92,22 @@ class notification {
     return array_keys($subscribers);
   }
 
-  static function send_item_updated($item) {
+  static function send_item_updated($original, $item) {
     $subscribers = self::get_subscribers($item);
     if (!$subscribers) {
       return;
     }
 
     $v = new View("item_updated.html");
+    $v->original = $original;
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album \"%title\" updated", array("title" => $item->original()->title)) :
+      t("Album \"%title\" updated", array("title" => $original->title)) :
       ($item->is_photo() ?
-       t("Photo \"%title\" updated", array("title" => $item->original()->title))
-       : t("Movie \"%title\" updated", array("title" => $item->original()->title)));
+       t("Photo \"%title\" updated", array("title" => $original->title))
+       : t("Movie \"%title\" updated", array("title" => $original->title)));
+
+    Kohana_Log::add("error",print_r($v->render(),1));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }