Commit d2c11925 authored by mmn's avatar mmn

To-selector padlock only shown if site config notice/allowprivate is true

parent 5fbb0113
......@@ -291,6 +291,7 @@ $default =
),
'notice' =>
array('contentlimit' => null,
'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
'defaultscope' => null, // null means 1 if site/private, 0 otherwise
'hidespam' => true), // Whether to hide silenced users from timelines
'message' =>
......
......@@ -127,10 +127,12 @@ class ToSelector extends Widget
$default);
$this->out->elementStart('span', 'checkbox-wrapper');
$this->out->checkbox('notice_private',
// TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
_('Private?'),
$this->private);
if (common_config('notice', 'allowprivate')) {
$this->out->checkbox('notice_private',
// TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
_('Private?'),
$this->private);
}
$this->out->elementEnd('span');
}
......@@ -138,7 +140,7 @@ class ToSelector extends Widget
{
// XXX: make arg name selectable
$toArg = $action->trimmed('notice_to');
$private = $action->boolean('notice_private');
$private = common_config('notice', 'allowprivate') ? $action->boolean('notice_private') : false;
if (empty($toArg)) {
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment