diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-01 03:43:11 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-01 03:43:11 -0700 |
| commit | a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58 (patch) | |
| tree | e775eb73e1e5e5440b55a4e7dc0288a6b1689ce0 /Zotlabs/Widget/Activity_order.php | |
| parent | 4df5d44ef9792b04a2653c92cba49a2fa69656ac (diff) | |
| parent | 6bf0f4225c0fc7ecc1762ed5cfe2c4861cd1bd4e (diff) | |
| download | volse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.tar.gz volse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.tar.bz2 volse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Widget/Activity_order.php')
| -rw-r--r-- | Zotlabs/Widget/Activity_order.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index 10ec142d9..93bfc5a26 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -105,17 +105,21 @@ class Activity_order { call_hooks('network_tabs', $arr); - $tpl = get_markup_template('common_pills.tpl'); + $o = ''; if($arr['tabs']) { - return replace_macros($tpl, [ + $content = replace_macros(get_markup_template('common_pills.tpl'), [ + '$pills' => $arr['tabs'], + ]); + + $o = replace_macros(get_markup_template('common_widget.tpl'), [ '$title' => t('Activity Order'), - '$tabs' => $arr['tabs'], + '$content' => $content, ]); } - else { - return ''; - } + + return $o; + } } |