From 09da289c2fb18475f372bee24e885617da484e0b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 17 Oct 2015 22:19:49 -0400
Subject: Move slack, hipchat and jabber integrations to plugins

---
 app/Model/ProjectNotificationType.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/Model/ProjectNotificationType.php')

diff --git a/app/Model/ProjectNotificationType.php b/app/Model/ProjectNotificationType.php
index d8568589..a4719598 100644
--- a/app/Model/ProjectNotificationType.php
+++ b/app/Model/ProjectNotificationType.php
@@ -26,13 +26,13 @@ class ProjectNotificationType extends NotificationType
      */
     public function getSelectedTypes($project_id)
     {
-        $selectedTypes = $this->db
+        $types = $this->db
             ->table(self::TABLE)
             ->eq('project_id', $project_id)
             ->asc('notification_type')
             ->findAllByColumn('notification_type');
 
-        return array_merge($this->getHiddenTypes(), $selectedTypes);
+        return $this->filterTypes($types);
     }
 
     /**
@@ -52,6 +52,6 @@ class ProjectNotificationType extends NotificationType
             $results[] = $this->db->table(self::TABLE)->insert(array('project_id' => $project_id, 'notification_type' => $type));
         }
 
-        return ! in_array(false, $results);
+        return ! in_array(false, $results, true);
     }
 }
-- 
cgit v1.2.3