diff options
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/conversation.php b/include/conversation.php index 93f7e11a7..ce0467770 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1361,16 +1361,8 @@ function status_editor($a, $x, $popup = false) { } $sharebutton = (x($x,'button') ? $x['button'] : t('Share')); - $content = ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''); - if(!$content) { - $content = get_pconfig(local_channel(),'autosavetext_post','body'); - } - $title = ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''); - if(!$title) { - $title = get_pconfig(local_channel(),'autosavetext_post','title'); - } - $placeholdtext = (x($x,'content_label') ? $x['content_label'] : $sharebutton); - + $placeholdtext = (x($x,'content_label') ? $x['content_label'] : $sharebutton); + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', @@ -1402,14 +1394,14 @@ function status_editor($a, $x, $popup = false) { '$feature_nocomment' => $feature_nocomment, '$nocomment' => ((array_key_exists('item',$x)) ? $x['item']['item_nocomment'] : 0), '$clearloc' => $clearloc, - '$title' => $title, + '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), '$catsenabled' => $catsenabled, '$category' => ((x($x, 'category')) ? $x['category'] : ''), '$placeholdercategory' => t('Categories (optional, comma-separated list)'), '$permset' => t('Permission settings'), '$ptyp' => ((x($x, 'ptyp')) ? $x['ptyp'] : ''), - '$content' => $content, + '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => ((x($x, 'post_id')) ? $x['post_id'] : ''), '$defloc' => $x['default_location'], |