[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX]TikiMail: String expected null given
"ushindi bienvenu \(@usbbush\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68961e2580a1e_2cd60b0398bb@gitlab-sidekiq-low-urgency-cpu-bound-v2-5d978b66f5-vthrp.mail> |
ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
c7326c4c by ushindi bienvenu at 2025-08-08T15:48:31+00:00
[FIX]TikiMail: String expected null given
---
* [FIX]TikiMail: String expected null given
See merge request tikiwiki/tiki!8239
- - - - -
1 changed file:
- lib/webmail/tikimaillib.php
Changes:
=====================================
lib/webmail/tikimaillib.php
=====================================
@@ -26,10 +26,10 @@ class TikiMail
/**
* @param string|null $user to username
- * @param string|null $from from email
- * @param string|null $fromName from Name
+ * @param string $from from email
+ * @param string $fromName from Name
*/
- public function __construct($user = null, $from = null, $fromName = null)
+ public function __construct($user = null, $from = '', $fromName = '')
{
global $user_preferences, $prefs;
@@ -78,27 +78,18 @@ class TikiMail
{
}
- public function setSender($email, $name = null)
+ public function setSender($email, $name = '')
{
- if (! $name) {
- $name = null;
- }
$this->mail->sender(new Address($email, $name));
}
- public function setFrom($email, $name = null)
+ public function setFrom($email, $name = '')
{
- if (! $name) {
- $name = null;
- }
$this->mail->from(new Address($email, $name));
}
- public function setReplyTo($email, $name = null)
+ public function setReplyTo($email, $name = '')
{
- if (! $name) {
- $name = null;
- }
$this->mail->replyTo(new Address($email, $name));
}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/c7326c4caf89b06afba2795938064d19cfaf76a0
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/c7326c4caf89b06afba2795938064d19cfaf76a0
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs