diff options
| author | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
| commit | 2bca2199112625593eb412584e17e874e71ca913 (patch) | |
| tree | c6679ddb544217a10d8255578009c4ba8951bc6b /mod/settings.php | |
| parent | 54727d3a66df92596378ea7f5c412d5e6037b037 (diff) | |
| parent | f38ab0904101366bf536d46ab460dcd5cf4f60ca (diff) | |
| download | volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.gz volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.bz2 volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mod/settings.php b/mod/settings.php index ec758bc90..97965d0fd 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -939,6 +939,7 @@ function settings_content(&$a) { '$pmacro1' => t('Private - <em>default private, never open or public</em>'), '$pmacro0' => t('Blocked - <em>default blocked to/from everybody</em>'), '$permiss_arr' => $permiss, + '$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'),array(t('No'),t('Yes'))), '$lbl_p2macro' => t('Advanced Privacy Settings'), |