diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-21 16:33:59 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-21 16:33:59 -0700 |
| commit | b6a545b4a279061c7e786dbfe4d63679bfe18e07 (patch) | |
| tree | 7da62eb162b2c26116923bf5995d6499f840b4c8 /include/conversation.php | |
| parent | 4d34d9c03269ea9b8ca038a87f5351cfe4dbeff1 (diff) | |
| parent | 4f62d7a78f63e4bae136f52d70d0af906d997b78 (diff) | |
| download | volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.gz volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.tar.bz2 volse-hubzilla-b6a545b4a279061c7e786dbfe4d63679bfe18e07.zip | |
Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 7d1473fe2..637234bff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1200,8 +1200,6 @@ function status_editor($a, $x, $popup = false) { $tpl = get_markup_template('jot.tpl'); - $jotplugins = ''; - $preview = t('Preview'); if(x($x, 'hide_preview')) $preview = ''; @@ -1218,8 +1216,14 @@ function status_editor($a, $x, $popup = false) { if(! $cipher) $cipher = 'aes256'; + $jotplugins = ''; call_hooks('jot_tool', $jotplugins); + $jotnets = ''; + if(x($x,'jotnets')) { + call_hooks('jot_networks', $jotnets); + } + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', @@ -1276,6 +1280,8 @@ function status_editor($a, $x, $popup = false) { '$preview' => $preview, '$source' => ((x($x, 'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, + '$jotnets' => $jotnets, + '$jotnets_label' => t('Other networks and post services'), '$defexpire' => $defexpire, '$feature_expire' => $feature_expire, '$expires' => t('Set expiration date'), |