GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Consistently use "email-notify_fave" syntax for preference

This commit is contained in:
Mikael Nordfeldth 2014-07-27 23:25:49 +02:00
parent 2d0c7c2c99
commit d11ce2ef3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mail.php
View File

@ -683,7 +683,7 @@ function mail_notify_fave(User $rcpt, Profile $sender, Notice $notice)
return; return;
} }
if (!$rcpt->getPref('notify', 'email_fave', 1)) { if (!$rcpt->getPref('email', 'notify_fave', 1)) {
return; return;
} }

6
plugins/Favorite/FavoritePlugin.php
View File

@ -25,7 +25,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
*/ */
class FavoritePlugin extends ActivityHandlerPlugin class FavoritePlugin extends ActivityHandlerPlugin
{ {
protected $notify_email_fave = 1; protected $email_notify_fave = 1;
public function tag() public function tag()
{ {
@ -211,7 +211,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
foreach ($mentioned_ids as $id) { foreach ($mentioned_ids as $id) {
$mentioned = User::getKV('id', $id); $mentioned = User::getKV('id', $id);
if ($mentioned instanceof User && $mentioned->id != $stored->profile_id if ($mentioned instanceof User && $mentioned->id != $stored->profile_id
&& $mentioned->email && $mentioned->getPref('email', 'notify_fave', $this->notify_email_fave)) { // do we have an email, and does user want it? && $mentioned->email && $mentioned->getPref('email', 'notify_fave', $this->email_notify_fave)) { // do we have an email, and does user want it?
mail_notify_fave($mentioned, $stored->getProfile(), $stored->getParent()); mail_notify_fave($mentioned, $stored->getProfile(), $stored->getParent());
} }
} }
@ -409,7 +409,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
{ {
// getConfigData will fall back on systemwide default // getConfigData will fall back on systemwide default
// and we only wish to save numerical true or false. // and we only wish to save numerical true or false.
$emailfave = $scoped->getPref('email', 'notify_fave', $this->notify_email_fave) ? 1 : 0; $emailfave = $scoped->getPref('email', 'notify_fave', $this->email_notify_fave) ? 1 : 0;
$action->elementStart('li'); $action->elementStart('li');
$action->checkbox('email-notify_fave', $action->checkbox('email-notify_fave',