Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / toselector.php

diff --git a/lib/toselector.php b/lib/toselector.php
index 2026c1dfdd702bbf83bc0a00dabb8ceb991b2d07..7a959ff8b518e9e48ba23d997fbc651a3294803f 100644 (file)
--- 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.