From df2cc09362404237af52f8b992ed48bd7e926de0 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 19 Feb 2015 17:46:37 +0100
Subject: [PATCH] $this->scoped->getUser() instead of common_current_user();

---
 actions/emailsettings.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 96ada2c826..47c6fe54e5 100644
--- 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);