diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
| commit | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch) | |
| tree | 2f9d83d87682b16ac6ac949382ab566fdca48076 /mod/network.php | |
| parent | b361bcea83140c28b5a5677905405de0ac102791 (diff) | |
| parent | afd2bf031eff688ae53e51f9199d025ca1935abe (diff) | |
| download | volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2 volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* master:
Diffstat (limited to 'mod/network.php')
| -rw-r--r--[-rwxr-xr-x] | mod/network.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php index d27945a86..b12bd16da 100755..100644 --- a/mod/network.php +++ b/mod/network.php @@ -206,8 +206,12 @@ function network_content(&$a, $update = 0) { ); - $tpl = get_markup_template('common_tabs.tpl'); - $o .= replace_macros($tpl, array('$tabs'=>$tabs)); + + $arr = array('tabs' => $tabs); + call_hooks('network_tabs', $arr); + + $o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs'])); + // --- end item filter tabs |