Merge remote-tracking branch 'origin/1.7.x' into 1.8.x

This commit is contained in:
Jake Barnby 2025-08-18 17:37:32 +12:00
commit 51806082c4
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C

View file

@ -6,7 +6,6 @@ use Appwrite\Template\Template;
use Exception;
use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Runtime;
use Utopia\CLI\Console;
use Utopia\Logger\Log;
use Utopia\Platform\Action;
use Utopia\Queue\Message;
@ -149,17 +148,6 @@ class Mails extends Action
$mail->AltBody = \strip_tags($mail->AltBody);
$mail->AltBody = \trim($mail->AltBody);
if (\str_contains($mail->Body, 'buttonText') || \str_contains($mail->AltBody, 'buttonText')) {
Console::warning('Email might contain placeholder. Logs relevant to verify and isolate the issue:');
var_dump($mail->Body);
var_dump($mail->AltBody);
\var_dump($message->getPayload());
\var_dump($message->getPid());
\var_dump($message->getQueue());
\var_dump($message->getTimestamp());
Console::warning('End of placeholder detection report.');
}
$replyTo = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
$replyToName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));