diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-05 12:17:36 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-05 12:17:36 -0800 |
| commit | ec18c3770bd1ff444713c94f8405b75692848274 (patch) | |
| tree | 67de268ba0d99225a7854057b9596a503792047e | |
| parent | 982b596fa465fce3477decc5d19763c76425e2f7 (diff) | |
| download | volse-hubzilla-ec18c3770bd1ff444713c94f8405b75692848274.tar.gz volse-hubzilla-ec18c3770bd1ff444713c94f8405b75692848274.tar.bz2 volse-hubzilla-ec18c3770bd1ff444713c94f8405b75692848274.zip | |
issue #639, voting setting is lost after post is edited (also the disabling of comments)
| -rw-r--r-- | Zotlabs/Module/Editpost.php | 1 | ||||
| -rw-r--r-- | include/conversation.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 5c04653b8..d7612b165 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -78,6 +78,7 @@ class Editpost extends \Zotlabs\Web\Controller { $x = array( 'nickname' => $channel['channel_address'], + 'item' => $itm[0], 'editor_autocomplete'=> true, 'bbco_autocomplete'=> 'bbcode', 'return_path' => $_SESSION['return_url'], diff --git a/include/conversation.php b/include/conversation.php index 941b55159..0ff368e6e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1396,11 +1396,11 @@ function status_editor($a, $x, $popup = false) { '$setloc' => $setloc, '$voting' => t('Toggle voting'), '$feature_voting' => $feature_voting, - '$consensus' => 0, + '$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0), '$nocommenttitle' => t('Disable comments'), '$nocommenttitlesub' => t('Toggle comments'), '$feature_nocomment' => $feature_nocomment, - '$nocomment' => 0, + '$nocomment' => ((array_key_exists('item',$x)) ? $x['item']['item_nocomment'] : 0), '$clearloc' => $clearloc, '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), |