eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Removing MicroID as well as simplifying profileaction

Browse Source 
sorry, forgot to commit in between
This commit is contained in:
Mikael Nordfeldth
2015-07-14 16:52:20 +02:00
parent e868ac41cd
commit 01a4ab30dc
12 changed files with 33 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
actions/emailsettings.php
View File

@@ -231,12 +231,6 @@ class EmailsettingsAction extends SettingsAction
_('Allow friends to nudge me and send me an email.'),
$user->emailnotifynudge);
$this->elementEnd('li');
$this->elementStart('li');
$this->checkbox('emailmicroid',
// TRANS: Checkbox label in e-mail preferences form.
_('Publish a MicroID for my email address.'),
$user->emailmicroid);
$this->elementEnd('li');
Event::handle('EndEmailFormData', array($this, $this->scoped));
}
$this->elementEnd('ul');
@@ -320,7 +314,6 @@ class EmailsettingsAction extends SettingsAction
$emailnotifymsg = $this->booleanintstring('emailnotifymsg');
$emailnotifynudge = $this->booleanintstring('emailnotifynudge');
$emailnotifyattn = $this->booleanintstring('emailnotifyattn');
$emailmicroid = $this->booleanintstring('emailmicroid');
$emailpost = $this->booleanintstring('emailpost');
$user->query('BEGIN');
@@ -331,7 +324,6 @@ class EmailsettingsAction extends SettingsAction
$user->emailnotifymsg = $emailnotifymsg;
$user->emailnotifynudge = $emailnotifynudge;
$user->emailnotifyattn = $emailnotifyattn;
$user->emailmicroid = $emailmicroid;
$user->emailpost = $emailpost;
$result = $user->update($original);