Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #17944.

Browse Source
This commit is contained in:
tianshujie
2022-03-16 12:09:51 +08:00
parent 0fde764778
commit b213f38e1f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/mail/model.php
View File

@@ -691,7 +691,7 @@ class mailModel extends model
$nameFields = $this->config->action->objectNameFields[$objectType];
$title = zget($object, $nameFields, '');
$subject = $this->getSubject($objectType, $object, $title, $action->action);
$domain = defined('RUN_MODE') && RUN_MODE == 'api' ? '' : zget($this->config->mail, 'domain', common::getSysURL());
$domain = (defined('RUN_MODE') and RUN_MODE == 'api') ? '' : zget($this->config->mail, 'domain', common::getSysURL());
if($objectType == 'review' and empty($object->auditedBy)) return;

6
module/message/model.php
View File

@@ -74,13 +74,13 @@ class messageModel extends model
{
/* If it is an api call, get the request method set by the user. */
global $config;
$requestType = $this->config->requestType;
if(defined('RUN_MODE') && RUN_MODE == 'api') include $this->app->getConfigRoot() . 'my.php';
$requestType = $config->requestType;
if(defined('RUN_MODE') and RUN_MODE == 'api') include $this->app->getConfigRoot() . 'config.php';
$moduleName = $objectType == 'case' ? 'testcase' : $objectType;
$this->loadModel('mail')->sendmail($objectID, $actionID);
if(defined('RUN_MODE') && RUN_MODE == 'api') $this->config->requestType = $requestType;
if(defined('RUN_MODE') and RUN_MODE == 'api') $config->requestType = $requestType;
}
}