Merge https://github.com/friendica/dir into dpull

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
old mode 100755 (executable)
new mode 100644 (file)
index f23b305..4c00201
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,6 +28,10 @@ function editpost_content(&$a) {
                return;
        }
 
+       $plaintext = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $plaintext = true;
+
 
        $o .= '<h2>' . t('Edit post') . '</h2>';
 
@@ -100,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'],
@@ -111,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),