Merge branch 'remove_broken_plugins_from_default' into 'nightly'

[quix0rs-gnu-social.git] / actions / emailsettings.php

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 47c6fe54e513a738cedf12a7275d6e8edcbbf19a..a0f111c0d5ab6bc0a6b698b6d96fed60dda6f36d 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -91,7 +91,7 @@ class EmailsettingsAction extends SettingsAction
      */
     function showContent()
     {
-        $user = common_current_user();
+        $user = $this->scoped->getUser();
 
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_settings_email',
@@ -316,12 +316,12 @@ class EmailsettingsAction extends SettingsAction
         $user = $this->scoped->getUser();
 
         if (Event::handle('StartEmailSaveForm', array($this, $this->scoped))) {
-            $emailnotifysub   = $this->boolean('emailnotifysub');
-            $emailnotifymsg   = $this->boolean('emailnotifymsg');
-            $emailnotifynudge = $this->boolean('emailnotifynudge');
-            $emailnotifyattn  = $this->boolean('emailnotifyattn');
-            $emailmicroid     = $this->boolean('emailmicroid');
-            $emailpost        = $this->boolean('emailpost');
+            $emailnotifysub   = $this->booleanintstring('emailnotifysub');
+            $emailnotifymsg   = $this->booleanintstring('emailnotifymsg');
+            $emailnotifynudge = $this->booleanintstring('emailnotifynudge');
+            $emailnotifyattn  = $this->booleanintstring('emailnotifyattn');
+            $emailmicroid     = $this->booleanintstring('emailmicroid');
+            $emailpost        = $this->booleanintstring('emailpost');
 
             $user->query('BEGIN');
 
@@ -410,6 +410,7 @@ class EmailsettingsAction extends SettingsAction
                 $this->serverError(_('Could not insert confirmation code.'));
             }
 
+            common_debug('Sending confirmation address for user '.$user->id.' to email '.$email);
             mail_confirm_address($user, $confirm->code, $user->nickname, $email);
 
             Event::handle('EndAddEmailAddress', array($user, $email));