Simplify logic a bit and tweak the visible text.

1 files changed, 5 insertions, 6 deletions

diff --git a/modules/notification/controllers/notification.php b/modules/notification/controllers/notification.php
index 8722f890..c32064ba 100644
--- a/modules/notification/controllers/notification.php
+++ b/modules/notification/controllers/notification.php
@@ -24,13 +24,12 @@ class Notification_Controller extends Controller {
     $item = ORM::factory("item", $id);
     access::required("view", $item);
 
-    $watching = notification::is_watching($item);
-    if (!$watching) {
-      notification::add_watch($item);
-      message::success(sprintf(t("Watch Enabled on %s!"), $item->title));
-    } else {
+    if (notification::is_watching($item)) {
       notification::remove_watch($item);
-      message::success(sprintf(t("Watch Removed on %s!"), $item->title));
+      message::success(sprintf(t("You are no longer watching %s"), $item->title));
+    } else {
+      notification::add_watch($item);
+      message::success(sprintf(t("You are now watching %s"), $item->title));
     }
     url::redirect($item->url());
   }