harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix
2016-05-01 19:20:09 -07:00
parent cd518625bf b4bf71dd06
commit 23bb4e8e15
7 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/conversation.php
View File

@@ -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,