aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
committerredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
commit23bb4e8e1546a8f8b3319e39172cf2fd17cb4139 (patch)
tree15b7ba8f607da56f7f84ab4d1039c4768069095d /include
parentcd518625bf561f1ed42db0b78030b74c32435136 (diff)
parentb4bf71dd0642e58fab6151e1df3c071d05650492 (diff)
downloadvolse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.gz
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.bz2
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ba9d551a7..ea5be221f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1138,6 +1138,14 @@ function status_editor($a, $x, $popup = false) {
if(x($x, 'hide_location'))
$geotag = $setloc = $clearloc = '';
+ $weblink = t('Insert web link');
+ if(x($x, 'hide_weblink'))
+ $weblink = '';
+
+ $writefiles = perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage');
+ if(x($x, 'hide_attach'))
+ $writefiles = false;
+
$mimeselect = '';
if(array_key_exists('mimetype', $x) && $x['mimetype']) {
if($x['mimetype'] != 'text/bbcode')
@@ -1213,14 +1221,14 @@ function status_editor($a, $x, $popup = false) {
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
'$id_select' => $id_select,
'$id_seltext' => t('Post as'),
- '$writefiles' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'),
+ '$writefiles' => $writefiles,
'$bold' => t('Bold'),
'$italic' => t('Italic'),
'$underline' => t('Underline'),
'$quote' => t('Quote'),
'$code' => t('Code'),
'$attach' => t('Attach file'),
- '$weblink' => t('Insert web link'),
+ '$weblink' => $weblink,
'$setloc' => $setloc,
'$voting' => t('Toggle voting'),
'$feature_voting' => $feature_voting,