diff options
author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
---|---|---|
committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
commit | 388872949ed0de4cf036e546fafb3f4b4bd04fee (patch) | |
tree | 2fcefc5c8f2398166b8e7003033fe160cb3325fc /mod/settings.php | |
parent | b47ff712deafdb8617599b0af4403b9563c9be93 (diff) | |
parent | 301c7cdb89b13c4fc7c502795f121e13c1f9441d (diff) | |
download | volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.gz volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.bz2 volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.zip |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/settings.php')
-rw-r--r-- | mod/settings.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index bdf30bae2..c72fdc8c4 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -792,7 +792,8 @@ function settings_content(&$a) { $perm_opts = array( array( t('Nobody except yourself'), 0), array( t('Only those you specifically allow'), PERMS_SPECIFIC), - array( t('Anybody in your address book'), PERMS_CONTACTS), + array( t('Approved connections'), PERMS_CONTACTS), + array( t('Any connections'), PERMS_PENDING), array( t('Anybody on this website'), PERMS_SITE), array( t('Anybody in this network'), PERMS_NETWORK), array( t('Anybody authenticated'), PERMS_AUTHED), |