From a838c909512591e12597f1a421be871399e1d097 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 18 Feb 2016 00:33:16 +0100 Subject: [PATCH] Only show "public:site" in ToSelector if notice/allowprivate is true --- lib/toselector.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/toselector.php b/lib/toselector.php index 2026c1dfdd..7a959ff8b5 100644 --- a/lib/toselector.php +++ b/lib/toselector.php @@ -119,9 +119,11 @@ class ToSelector extends Widget // Reverse so we can add entries at the end (can't unshift with a key) $choices = array_reverse($choices); - // TRANS: Option in drop-down of potential addressees. - // TRANS: %s is a StatusNet sitename. - $choices['public:site'] = sprintf(_('Everyone at %s'), common_config('site', 'name')); + if (common_config('notice', 'allowprivate')) { + // TRANS: Option in drop-down of potential addressees. + // TRANS: %s is a StatusNet sitename. + $choices['public:site'] = sprintf(_('Everyone at %s'), common_config('site', 'name')); + } if (!common_config('site', 'private')) { // TRANS: Option in drop-down of potential addressees.