From 4dedaaa06daa61bcdd870723a9baaac6da6bdd43 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 3 Sep 2018 15:01:40 +0200
Subject: [PATCH] FIX: correctly check settings are set

---
 jobs/scheduled/update_mattermost_usernames.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/scheduled/update_mattermost_usernames.rb b/jobs/scheduled/update_mattermost_usernames.rb
index 0bfa7eb6..f891da7d 100644
--- a/jobs/scheduled/update_mattermost_usernames.rb
+++ b/jobs/scheduled/update_mattermost_usernames.rb
@@ -7,7 +7,9 @@ module Jobs
       post_id = SiteSetting.discourse_simple_calendar_holiday_post_id
       server = SiteSetting.discourse_simple_calendar_mattermost_server
 
-      return unless api_key && post_id && server
+      if api_key.blank? || post_id.blank? || server.blank?
+        return
+      end
 
       # Fetch all mattermost users
       response = Excon.get("#{server}/api/v4/users", headers: {