Consistently use "email-notify_fave" syntax for preference

diff --git a/lib/mail.php b/lib/mail.php
index 39714c5fc03cc6400094d361b2a1a09244a286e2..507b9254d3a4a64732493e10d29a0025add08f04 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -683,7 +683,7 @@ function mail_notify_fave(User $rcpt, Profile $sender, Notice $notice)
         return;
     }
 
-    if (!$rcpt->getPref('notify', 'email_fave', 1)) {
+    if (!$rcpt->getPref('email', 'notify_fave', 1)) {
         return;
     }
 

diff --git a/plugins/Favorite/FavoritePlugin.php b/plugins/Favorite/FavoritePlugin.php
index 062b2147cea4efc2f8b9dc69b062d3a6502ca89c..82409d23f7a5a8ec6aaafb043718b492e83ec8b5 100644 (file)
--- a/plugins/Favorite/FavoritePlugin.php
+++ b/plugins/Favorite/FavoritePlugin.php
@@ -25,7 +25,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class FavoritePlugin extends ActivityHandlerPlugin
 {
-    protected $notify_email_fave = 1;
+    protected $email_notify_fave = 1;
 
     public function tag()
     {
@@ -211,7 +211,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
         foreach ($mentioned_ids as $id) {
             $mentioned = User::getKV('id', $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());
             }
         }
@@ -409,7 +409,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
     {
         // getConfigData will fall back on systemwide default
         // 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->checkbox('email-notify_fave',