From 62596d462b4b20ab9440223875c59528939d8b64 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 6 Mar 2015 00:47:18 +0100
Subject: [PATCH] Get the values from the correct object.

---
 actions/emailsettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index fb61b2a05f..dfdbe1bad0 100644
--- 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',