diff options
| author | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-01-06 15:13:03 +0100 |
| commit | b80c218606994032e76805900cb9b340ea132358 (patch) | |
| tree | bf625cf4c59bf521e639018399bf1770d116a6a0 /include/acl_selectors.php | |
| parent | aa6d61d3b19cb13c30bf5a1579adefedf0cc9515 (diff) | |
| parent | 3185bfe3ca131d471b8fcdc0c94abf1a114486c7 (diff) | |
| download | volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.gz volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.tar.bz2 volse-hubzilla-b80c218606994032e76805900cb9b340ea132358.zip | |
Merge pull request #1 from friendica/master
test pull request
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 8d94264e4..243e7a549 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -171,7 +171,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n"; $r = q("SELECT abook_id, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash - where abook_flags = 0 or not ( abook_flags & %d ) and abook_channel = %d + where abook_flags = 0 or not ( abook_flags & %d )>0 and abook_channel = %d $sql_extra ORDER BY xchan_name ASC ", intval(ABOOK_FLAG_SELF), @@ -237,7 +237,7 @@ function populate_acl($defaults = null,$show_jotnets = true) { $tpl = get_markup_template("acl_selector.tpl"); $o = replace_macros($tpl, array( - '$showall'=> t("Visible to everybody"), + '$showall'=> t("Visible to your default audience"), '$show' => t("Show"), '$hide' => t("Don't show"), '$allowcid' => json_encode($allow_cid), @@ -248,8 +248,7 @@ function populate_acl($defaults = null,$show_jotnets = true) { '$aclModalTitle' => t('Permissions'), '$aclModalDismiss' => t('Close') )); - - + return $o; } |