diff options
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/mod/network.php b/mod/network.php index a0f4ab354..c86bbc261 100644 --- a/mod/network.php +++ b/mod/network.php @@ -368,26 +368,27 @@ function network_content(&$a, $update = 0, $load = false) { if(! $update) { - - $tpl = get_markup_template('main_slider.tpl'); - $o .= replace_macros($tpl,array( - '$val' => intval($cmin) . ';' . intval($cmax), - '$refresh' => t('Refresh'), - '$me' => t('Me'), - '$intimate' => t('Best Friends'), - '$friends' => t('Friends'), - '$coworkers' => t('Co-workers'), - '$oldfriends' => t('Former Friends'), - '$acquaintances' => t('Acquaintances'), - '$world' => t('Everybody') - )); + if(feature_enabled(local_user(),'affinity')) { + $tpl = get_markup_template('main_slider.tpl'); + $o .= replace_macros($tpl,array( + '$val' => intval($cmin) . ';' . intval($cmax), + '$refresh' => t('Refresh'), + '$me' => t('Me'), + '$intimate' => t('Best Friends'), + '$friends' => t('Friends'), + '$coworkers' => t('Co-workers'), + '$oldfriends' => t('Former Friends'), + '$acquaintances' => t('Acquaintances'), + '$world' => t('Everybody') + )); + } - $arr = array('tabs' => $tabs); - call_hooks('network_tabs', $arr); + $arr = array('tabs' => $tabs); + call_hooks('network_tabs', $arr); - $o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs'])); + $o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs'])); - // --- end item filter tabs + // --- end item filter tabs // search terms header @@ -666,7 +667,7 @@ function network_content(&$a, $update = 0, $load = false) { ); } else { -dbg(1); + $r = q("SELECT item.id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan WHERE item.uid = %d AND item.item_restrict = 0 @@ -677,7 +678,7 @@ dbg(1); intval(local_user()), intval(ABOOK_FLAG_BLOCKED) ); -dbg(0); + } // Then fetch all the children of the parents that are on this page |