aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-04-10 13:54:34 +1000
committerRedMatrix <info@friendica.com>2014-04-10 13:54:34 +1000
commit5d5ff22b1dc551863342d2c7c7f44607bbd44777 (patch)
tree236e1999b23db046106b8b54f9cea4b43d1b120d /include/conversation.php
parent46ed2570b80d7468dc6e875ccb02f533f9cbd139 (diff)
parentb88a7fc23a185a6ecfbc451bddc7da33ea2c4d4c (diff)
downloadvolse-hubzilla-5d5ff22b1dc551863342d2c7c7f44607bbd44777.tar.gz
volse-hubzilla-5d5ff22b1dc551863342d2c7c7f44607bbd44777.tar.bz2
volse-hubzilla-5d5ff22b1dc551863342d2c7c7f44607bbd44777.zip
Merge pull request #399 from git-marijus/master
change the way jot tools are displayed/hidden
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 8803e74e7..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,16 +1136,16 @@ 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,
'$source' => ((x($x,'source')) ? $x['source'] : ''),
'$jotplugins' => $jotplugins,
'$defexpire' => '',
- '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? true : false),
'$expires' => t('Set expiration date'),
- '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'),
+ '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),