From 47b38e1dfb5c3541ef66ca81b656065e8b6dc9dd Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 26 Nov 2015 11:12:01 +0100
Subject: [PATCH] Revert "Removed not longer needed checks."

This reverts commit 76a130ac96e61b39fee62e3104f2963d610e22ac.
---
 app/models/chat.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/chat.rb b/app/models/chat.rb
index ccc9b47c3..dc2704c97 100644
--- a/app/models/chat.rb
+++ b/app/models/chat.rb
@@ -5,6 +5,7 @@ class Chat < ApplicationModel
   store     :preferences
 
   def customer_state(session_id = nil)
+    return { state: 'chat_disabled' } if !Setting.get('chat')
 
     # reconnect
     if session_id
@@ -62,6 +63,7 @@ class Chat < ApplicationModel
   end
 
   def self.agent_state(user_id)
+    return { state: 'chat_disabled' } if !Setting.get('chat')
     assets = {}
     Chat.where(active: true).each {|chat|
       assets = chat.assets(assets)