1
0
Fork 0
mirror of synced 2024-06-27 02:31:04 +12:00

Merge branch 'main' of https://github.com/appwrite/appwrite into chhore-parallelize-tests

This commit is contained in:
德华 刘 2023-10-22 15:16:40 +00:00
commit 42ce9d881a
3 changed files with 3 additions and 3 deletions

View file

@ -16,7 +16,6 @@ jobs:
with:
fetch-depth: 2
submodules: recursive
ref: cl-1.4.x
- name: Login to Docker Hub
uses: docker/login-action@v2

View file

@ -426,7 +426,7 @@ class Certificates extends Action
$locale->setDefault('en');
}
$body = Template::fromFile(__DIR__ . '/../config/locale/templates/email-base.tpl');
$body = Template::fromFile(__DIR__ . '/../../../../app/config/locale/templates/email-base.tpl');
$subject = \sprintf($locale->getText("emails.certificate.subject"), $domain);
$body

View file

@ -5,6 +5,7 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Template\Template;
use Exception;
use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Runtime;
use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Platform\Action;
@ -39,7 +40,7 @@ class Mails extends Action
*/
public function action(Message $message, Registry $register): void
{
Runtime::setHookFlags(SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_TCP);
$payload = $message->getPayload() ?? [];
if (empty($payload)) {