diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
| commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
| tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /mod/editpost.php | |
| parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
| parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
| download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'mod/editpost.php')
| -rw-r--r-- | mod/editpost.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index b01afe9b3..e731c04fe 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -57,9 +57,9 @@ function editpost_content(&$a) { if($itm[0]['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); if($itm[0]['title']) - $itm[0]['title'] = aes_unencapsulate(json_decode_plus($itm[0]['title']),$key); + $itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); if($itm[0]['body']) - $itm[0]['body'] = aes_unencapsulate(json_decode_plus($itm[0]['body']),$key); + $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); } $tpl = get_markup_template("jot.tpl"); @@ -114,7 +114,7 @@ function editpost_content(&$a) { '$pvisit' => 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), '$placeholdertitle' => t('Set title'), '$category' => $category, '$placeholdercategory' => t('Categories (comma-separated list)'), |