Merge pull request #574 from exodus4d/develop

- fixed some cURL errors for not existing discord map configuration
exodus4d · Jan 1, 2018 · 5c91bb6 · 5c91bb6
2 parents c6fad42 + 8c10645
commit 5c91bb6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/main/model/mapmodel.php b/app/main/model/mapmodel.php
@@ -1110,7 +1110,7 @@ public function getSlackWebHookConfig(string $channel = ''): \stdClass{
         $config->slackWebHookURL = $this->slackWebHookURL;
         $config->slackUsername = $this->slackUsername;
         $config->slackIcon = $this->slackIcon;
-        if($channel && $this->exists($channel)){
+        if($channel && $this->exists($channel) && !empty($this->$channel)){
             $config->slackChannel = $this->$channel;
         }
         return $config;
@@ -1124,7 +1124,7 @@ public function getSlackWebHookConfig(string $channel = ''): \stdClass{
     public function getDiscordWebHookConfig(string $channel = ''): \stdClass {
         $config = (object) [];
         $config->slackUsername = $this->discordUsername;
-        if($channel && $this->exists($channel)){
+        if($channel && $this->exists($channel) && !empty($this->$channel)){
             $config->slackWebHookURL = $this->$channel . '/slack';
         }
         return $config;