3 files changed, 15 insertions, 16 deletions
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 8ee0c6ba..e246af2c 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -82,17 +82,16 @@ class notification {
     return $subscribers;
   }
 
-  static function send_item_updated($old, $new) {
+  static function send_item_updated($item) {
     $v = new View("item_updated.html");
-    $v->old = $old;
-    $v->new = $new;
-    $v->subject = $old->is_album() ?
-      t("Album %title updated", array("title" => $old->title)) :
-      ($old->is_photo() ?
-       t("Photo %title updated", array("title" => $old->title))
-       : t("Movie %title updated", array("title" => $old->title)));
-
-    self::_notify_subscribers($old, $v->render(), $v->subject);
+    $v->item = $item;
+    $v->subject = $item->is_album() ?
+      t("Album %title updated", array("title" => $item->original("title"))) :
+      ($item->is_photo() ?
+       t("Photo %title updated", array("title" => $item->original("title")))
+       : t("Movie %title updated", array("title" => $item->original("title"))));
+
+    self::_notify_subscribers($item, $v->render(), $v->subject);
   }
 
   static function send_item_add($item) {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 1cf9ff58..536557c6 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class notification_event_Core {
-  static function item_updated($old, $new) {
-    notification::send_item_updated($old, $new);
+  static function item_updated($item) {
+    notification::send_item_updated($item);
   }
 
   static function item_created($item) {
     notification::send_item_add($item);
   }
 
-  static function item_before_delete($item) {
+  static function item_deleted($item) {
     notification::send_item_deleted($item);
 
     if (notification::is_watching($item)) {
@@ -40,8 +40,8 @@ class notification_event_Core {
     }
   }
 
-  static function comment_updated($old, $new) {
-    if ($new->state == "published" && $old->state != "published") {
+  static function comment_updated($item) {
+    if ($item->state == "published" && $item->original("state") != "published") {
       notification::send_comment_published($new);
     }
   }
diff --git a/modules/notification/helpers/notification_menu.php b/modules/notification/helpers/notification_menu.php
index 696aad62..87478b8a 100644
--- a/modules/notification/helpers/notification_menu.php
+++ b/modules/notification/helpers/notification_menu.php
@@ -21,7 +21,7 @@ class notification_menu_Core {
   static function site($menu, $theme) {
     if (!user::active()->guest) {
       $item = $theme->item();
-      
+
       if ($item && $item->is_album()) {
         $watching = notification::is_watching($item);