diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /mod/editpost.php | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'mod/editpost.php')
| -rw-r--r--[-rwxr-xr-x] | mod/editpost.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index 778ac3dcc..4c00201ca 100755..100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -104,7 +104,7 @@ function editpost_content(&$a) { '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], - '$content' => $itm[0]['body'], + '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$baseurl' => $a->get_baseurl(), '$defloc' => $a->user['default-location'], @@ -115,6 +115,8 @@ function editpost_content(&$a) { '$jotnets' => $jotnets, '$title' => $itm[0]['title'], '$placeholdertitle' => t('Set title'), + '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), + '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), |