dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #574 from exodus4d/develop

Browse Source 
- fixed some cURL errors for not existing discord map configuration
This commit is contained in:
Mark Friedrich
2018-01-01 22:19:50 +01:00
committed by GitHub
parent c6fad429e2 8c10645ba5
commit 5c91bb629a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/model/mapmodel.php
View File

@@ -1110,7 +1110,7 @@ class MapModel extends AbstractMapTrackingModel {
$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 @@ class MapModel extends AbstractMapTrackingModel {
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;