aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-04-09 18:29:22 +0200
committermarijus <mario@mariovavti.com>2014-04-09 18:29:22 +0200
commitb88a7fc23a185a6ecfbc451bddc7da33ea2c4d4c (patch)
tree12febbdd1e0aff655a7e3a0d18ca2865a423070f /include/conversation.php
parent74bd772a5bba5cd2c92e708d237128ab2dbdb53c (diff)
downloadvolse-hubzilla-b88a7fc23a185a6ecfbc451bddc7da33ea2c4d4c.tar.gz
volse-hubzilla-b88a7fc23a185a6ecfbc451bddc7da33ea2c4d4c.tar.bz2
volse-hubzilla-b88a7fc23a185a6ecfbc451bddc7da33ea2c4d4c.zip
use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it.
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 5a7e9e2cd..09bdc022f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1129,7 +1129,6 @@ function status_editor($a,$x,$popup=false) {
'$baseurl' => $a->get_baseurl(true),
'$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
- '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
@@ -1137,7 +1136,7 @@ function status_editor($a,$x,$popup=false) {
'$acl' => $x['acl'],
'$mimeselect' => $mimeselect,
'$layoutselect' => $layoutselect,
- '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'),
+ '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : true),
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => $preview,