forked from GNUsocial/gnu-social
$this->scoped->getUser() instead of common_current_user();
This commit is contained in:
parent
042cb1604a
commit
df2cc09362
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue