GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-02-19 17:46:37 +01:00
parent 042cb1604a
commit df2cc09362
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/emailsettings.php
View File

@ -313,7 +313,7 @@ class EmailsettingsAction extends SettingsAction
*/ */
function savePreferences() function savePreferences()
{ {
$user = common_current_user(); $user = $this->scoped->getUser();
if (Event::handle('StartEmailSaveForm', array($this, $this->scoped))) { if (Event::handle('StartEmailSaveForm', array($this, $this->scoped))) {
$emailnotifysub = $this->boolean('emailnotifysub'); $emailnotifysub = $this->boolean('emailnotifysub');
@ -323,8 +323,6 @@ class EmailsettingsAction extends SettingsAction
$emailmicroid = $this->boolean('emailmicroid'); $emailmicroid = $this->boolean('emailmicroid');
$emailpost = $this->boolean('emailpost'); $emailpost = $this->boolean('emailpost');
assert(!is_null($user)); // should already be checked
$user->query('BEGIN'); $user->query('BEGIN');
$original = clone($user); $original = clone($user);