diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-20 10:01:12 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-20 10:01:12 +0200 |
| commit | 020deefba613327a1d8875ba7f2cf9a750be42dd (patch) | |
| tree | f5989c7f45b512c81cc4bec025e7c7137419d516 /mod/settings.php | |
| parent | 1c9ed08620578bebc8af16e003a2ecef2b8a1f37 (diff) | |
| parent | b27d68633be6219c3f65d830178e3dc96c1c91e9 (diff) | |
| download | volse-hubzilla-020deefba613327a1d8875ba7f2cf9a750be42dd.tar.gz volse-hubzilla-020deefba613327a1d8875ba7f2cf9a750be42dd.tar.bz2 volse-hubzilla-020deefba613327a1d8875ba7f2cf9a750be42dd.zip | |
Merge remote-tracking branch 'friendika/master' into newacl
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mod/settings.php b/mod/settings.php index e11555687..1b4098de8 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -435,11 +435,6 @@ function settings_content(&$a) { )); - - - - - $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) ? true : false); @@ -495,6 +490,7 @@ function settings_content(&$a) { '$h_pass' => t('Password Settings'), '$password1'=> array('npassword', t('New Password:'), '', ''), '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')), + '$oid_enable' => (! get_config('system','no_openid')), '$openid' => $openid_field, '$h_basic' => t('Basic Settings'), @@ -527,11 +523,11 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), '$lbl_not' => t('Send a notification email when:'), - '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), ''), - '$notify2' => array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''), - '$notify3' => array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''), - '$notify4' => array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''), - '$notify5' => array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''), + '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), + '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''), + '$notify3' => array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''), + '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''), + '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''), |