diff options
| author | friendica <info@friendica.com> | 2014-04-09 21:13:40 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-09 21:13:40 -0700 |
| commit | 8d8d73924224f1f3862bffa4822b7d62600afd62 (patch) | |
| tree | eb83b0491fe69a2d712e8b3e898448ec363529a2 /include | |
| parent | 795d74171358abe23cc4be01dac0e48d04ee46b4 (diff) | |
| parent | 5d5ff22b1dc551863342d2c7c7f44607bbd44777 (diff) | |
| download | volse-hubzilla-8d8d73924224f1f3862bffa4822b7d62600afd62.tar.gz volse-hubzilla-8d8d73924224f1f3862bffa4822b7d62600afd62.tar.bz2 volse-hubzilla-8d8d73924224f1f3862bffa4822b7d62600afd62.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php index d56e468ad..9ffa1e77a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1133,7 +1133,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'), @@ -1141,16 +1140,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'), |