harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #639, voting setting is lost after post is edited (also the disabling of comments)

Browse Source
This commit is contained in:
zotlabs 2017-01-05 12:17:36 -08:00
parent 982b596fa4
commit ec18c3770b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Editpost.php
View File

@ -78,6 +78,7 @@ class Editpost extends \Zotlabs\Web\Controller {
$x = array( $x = array(
'nickname' => $channel['channel_address'], 'nickname' => $channel['channel_address'],
'item' => $itm[0],
'editor_autocomplete'=> true, 'editor_autocomplete'=> true,
'bbco_autocomplete'=> 'bbcode', 'bbco_autocomplete'=> 'bbcode',
'return_path' => $_SESSION['return_url'], 'return_path' => $_SESSION['return_url'],

4
include/conversation.php
View File

@ -1396,11 +1396,11 @@ function status_editor($a, $x, $popup = false) {
'$setloc' => $setloc, '$setloc' => $setloc,
'$voting' => t('Toggle voting'), '$voting' => t('Toggle voting'),
'$feature_voting' => $feature_voting, '$feature_voting' => $feature_voting,
'$consensus' => 0, '$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0),
'$nocommenttitle' => t('Disable comments'), '$nocommenttitle' => t('Disable comments'),
'$nocommenttitlesub' => t('Toggle comments'), '$nocommenttitlesub' => t('Toggle comments'),
'$feature_nocomment' => $feature_nocomment, '$feature_nocomment' => $feature_nocomment,
'$nocomment' => 0, '$nocomment' => ((array_key_exists('item',$x)) ? $x['item']['item_nocomment'] : 0),
'$clearloc' => $clearloc, '$clearloc' => $clearloc,
'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
'$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')),