projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix networking display on profiles
[platal.git]
/
include
/
validations.inc.php
diff --git
a/include/validations.inc.php
b/include/validations.inc.php
index
7724c3d
..
dcc4b63
100644
(file)
--- a/
include/validations.inc.php
+++ b/
include/validations.inc.php
@@
-529,7
+529,7
@@
abstract class ProfileValidate extends Validate
$mailer = new PlMailer();
$mailer->setSubject($this->_mail_subj());
$mailer->setFrom("validation+{$this->type}@{$globals->mail->domain}");
$mailer = new PlMailer();
$mailer->setSubject($this->_mail_subj());
$mailer->setFrom("validation+{$this->type}@{$globals->mail->domain}");
- $mailer->addTo("\"{$this->profile->fullName()}\" <{$this->profile->bestEmail()}>");
+ $mailer->addTo("\"{$this->profile->fullName()}\" <{$this->profile
Owner
->bestEmail()}>");
if (!$this->userIsProfileOwner) {
$mailer->addCc("\"{$this->user->fullName()}\" <{$this->user->bestEmail()}>");
}
if (!$this->userIsProfileOwner) {
$mailer->addCc("\"{$this->user->fullName()}\" <{$this->user->bestEmail()}>");
}
@@
-622,7
+622,11
@@
abstract class ProfileValidate extends Validate
public function id()
{
public function id()
{
- return $this->profile->id() . '_' . $this->type . '_' . $this->stamp;
+ if (!is_null($this->profile)) {
+ return $this->profile->id() . '_' . $this->type . '_' . $this->stamp;
+ } else {
+ return $this->user->id() . '_' . $this->type . '_' . $this->stamp;
+ }
}
// }}}
}
// }}}