Merge remote branch 'gallery3/master'

2 files changed, 3 insertions, 12 deletions

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 0cf536bc..e4212203 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -185,7 +185,7 @@ class notification {
           ->to($email)
           ->subject($pending->subject)
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($pending->body)
           ->send();
         $pending->delete();
@@ -199,7 +199,7 @@ class notification {
           ->to($email)
           ->subject(t("Multiple events have occurred")) // @todo fix this terrible subject line
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($text)
           ->send();
       }
@@ -213,7 +213,7 @@ class notification {
           ->to($subscribers)
           ->subject($subject)
           ->header("Mime-Version", "1.0")
-          ->header("Content-type", "text/html; charset=utf-8")
+          ->header("Content-Type", "text/html; charset=UTF-8")
           ->message($text)
           ->send();
       } else {
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index df9dbe48..5cd10de8 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -21,15 +21,6 @@ class notification_event_Core {
   // The assumption is that the exception was logged at a lower level, but we
   // don't want to screw up the processing that was generating the notification
   // so we don't pass the exception up the call stack
-  static function item_updated($original, $new) {
-    try {
-      notification::send_item_updated($original, $new);
-    } catch (Exception $e) {
-      Kohana_Log::add("error", "@todo notification_event::item_updated() failed");
-      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
-    }
-  }
-
   static function item_created($item) {
     try {
       notification::send_item_add($item);