diff options
| author | zotlabs <mike@macgirvin.com> | 2018-05-20 20:19:11 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-05-20 20:19:11 -0700 |
| commit | 0044906fabbfeb837326982bbc8d3fcc64b47fa8 (patch) | |
| tree | aa855fe68a468626b15f9b954c000680bb405b0b /include/conversation.php | |
| parent | ac8706e919d62a3a487fe3776e03160454ca8992 (diff) | |
| parent | 469809183d232761b8984848c133f9f11f5e7cea (diff) | |
| download | volse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.tar.gz volse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.tar.bz2 volse-hubzilla-0044906fabbfeb837326982bbc8d3fcc64b47fa8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 3041d2e21..4a1cdc7da 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1304,6 +1304,8 @@ function status_editor($a, $x, $popup = false) { $id_select = ''; $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); + + $reset = ((x($x,'reset')) ? $x['reset'] : ''); $feature_auto_save_draft = ((feature_enabled($x['profile_uid'], 'auto_save_draft')) ? "true" : "false"); @@ -1329,6 +1331,7 @@ function status_editor($a, $x, $popup = false) { '$nocomment_enabled' => t('Comments enabled'), '$nocomment_disabled' => t('Comments disabled'), '$auto_save_draft' => $feature_auto_save_draft, + '$reset' => $reset )); $tpl = get_markup_template('jot.tpl'); @@ -1441,7 +1444,8 @@ function status_editor($a, $x, $popup = false) { '$expiryModalCANCEL' => t('Cancel'), '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false), - '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0) + '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0), + '$reset' => $reset )); if ($popup === true) { |