$this->scoped->getUser() instead of common_current_user();

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

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 96ada2c826e49058b81be6db6d9d4b0d97ad8542..47c6fe54e513a738cedf12a7275d6e8edcbbf19a 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -313,7 +313,7 @@ class EmailsettingsAction extends SettingsAction
      */
     function savePreferences()
     {
-        $user = common_current_user();
+        $user = $this->scoped->getUser();
 
         if (Event::handle('StartEmailSaveForm', array($this, $this->scoped))) {
             $emailnotifysub   = $this->boolean('emailnotifysub');
@@ -323,8 +323,6 @@ class EmailsettingsAction extends SettingsAction
             $emailmicroid     = $this->boolean('emailmicroid');
             $emailpost        = $this->boolean('emailpost');
 
-            assert(!is_null($user)); // should already be checked
-
             $user->query('BEGIN');
 
             $original = clone($user);