mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 01:15:13 +00:00
preserve mimetype on page edits
This commit is contained in:
parent
6ad6aa307f
commit
a32d86f0a0
2 changed files with 18 additions and 5 deletions
|
@ -1013,7 +1013,7 @@ function status_editor($a,$x,$popup=false) {
|
|||
if(feature_enabled(local_user(),'richtext'))
|
||||
$plaintext = false;
|
||||
|
||||
$mimeselct = '';
|
||||
$mimeselect = '';
|
||||
if(array_key_exists('mimetype',$x) && $x['mimetype']) {
|
||||
if($x['mimetype'] != 'text/bbcode')
|
||||
$plaintext = true;
|
||||
|
@ -1021,9 +1021,10 @@ function status_editor($a,$x,$popup=false) {
|
|||
$mimeselect = mimetype_select($x['profile_uid']);
|
||||
}
|
||||
else
|
||||
$mimeselect = '<input name="mimetype" value="' . $x['mimetype'] . '" />';
|
||||
$mimeselect = '<input type="hidden" name="mimetype" value="' . $x['mimetype'] . '" />';
|
||||
}
|
||||
|
||||
$webpage = ((x($x,'webpage')) ? $x['webpage'] : '');
|
||||
|
||||
$tpl = get_markup_template('jot-header.tpl');
|
||||
|
||||
|
@ -1055,7 +1056,7 @@ function status_editor($a,$x,$popup=false) {
|
|||
'$return_path' => $a->query_string,
|
||||
'$action' => $a->get_baseurl(true) . '/item',
|
||||
'$share' => (x($x,'button') ? $x['button'] : t('Share')),
|
||||
'$webpage' => (x($x,'webpage') ? $x['webpage'] : ''),
|
||||
'$webpage' => $webpage,
|
||||
'$placeholdpagetitle' => t('Page link title'),
|
||||
'$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''),
|
||||
'$upload' => t('Upload photo'),
|
||||
|
@ -1074,7 +1075,7 @@ function status_editor($a,$x,$popup=false) {
|
|||
'$shortnoloc' => t('clear location'),
|
||||
'$title' => "",
|
||||
'$placeholdertitle' => t('Set title'),
|
||||
'$catsenabled' => ((feature_enabled($x['profile_uid'],'categories')) ? 'categories' : ''),
|
||||
'$catsenabled' => ((feature_enabled($x['profile_uid'],'categories') && (! $webpage)) ? 'categories' : ''),
|
||||
'$category' => "",
|
||||
'$placeholdercategory' => t('Categories (comma-separated list)'),
|
||||
'$wait' => t('Please wait'),
|
||||
|
|
|
@ -65,6 +65,17 @@ function editwebpage_content(&$a) {
|
|||
if(feature_enabled(local_user(),'richtext'))
|
||||
$plaintext = false;
|
||||
|
||||
|
||||
|
||||
$mimetype = $itm[0]['mimetype'];
|
||||
|
||||
$mimeselect = '';
|
||||
|
||||
if($mimetype != 'text/bbcode')
|
||||
$plaintext = true;
|
||||
$mimeselect = '<input type="hidden" name="mimetype" value="' . $mimetype . '" />';
|
||||
|
||||
|
||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||
'$title' => t('Edit post')
|
||||
));
|
||||
|
@ -118,6 +129,7 @@ function editwebpage_content(&$a) {
|
|||
'$pvisit' => 'none',
|
||||
'$public' => t('Public post'),
|
||||
'$jotnets' => $jotnets,
|
||||
'$mimeselect' => $mimeselect,
|
||||
'$title' => htmlspecialchars($itm[0]['title']),
|
||||
'$placeholdertitle' => t('Set title'),
|
||||
'$category' => '',
|
||||
|
|
Loading…
Reference in a new issue