diff options
| -rw-r--r-- | include/conversation.php | 9 | ||||
| -rw-r--r-- | mod/editwebpage.php | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 299cc1431..43de9fc8d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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'), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index f89be67c4..cd901e7e3 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -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') )); @@ -78,7 +89,7 @@ function editwebpage_content(&$a) { '$nickname' => $a->user['nickname'] )); - + $tpl = get_markup_template("jot.tpl"); $jotplugins = ''; @@ -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' => '', |