diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-10 17:03:30 -0700 |
| commit | e9f1bac062bc72f118c7633cf683b21a000d089e (patch) | |
| tree | f26c59e6399deb278b1659534d7c6ea75a397b95 /include | |
| parent | abfbe9c9375c7505e0422b8adc1d9d5426d7df1a (diff) | |
| parent | 46ed79c87a23f442eadc4244b62a6f85f3d431e8 (diff) | |
| download | volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.gz volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.tar.bz2 volse-hubzilla-e9f1bac062bc72f118c7633cf683b21a000d089e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index 5e9ba16a1..7d80b08fc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1173,7 +1173,9 @@ function status_editor($a, $x, $popup = false) { '$term' => t('Tag term:'), '$fileas' => t('Save to Folder:'), '$whereareu' => t('Where are you right now?'), - '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') + '$expireswhen' => t('Expires YYYY-MM-DD HH:MM'), + '$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''), + '$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_autocomplete'] : ''), )); $tpl = get_markup_template('jot.tpl'); @@ -1274,6 +1276,7 @@ function status_editor($a, $x, $popup = false) { '$expiryModalOK' => t('OK'), '$expiryModalCANCEL' => t('Cancel'), '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), + '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false) )); if ($popup === true) { |