diff options
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 7239e603b..43533e3c1 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -146,7 +146,7 @@ function localize_item(&$item){ case ACTIVITY_OBJ_NOTE: default: $post_type = t('status'); - if($obj['mid'] != $obj['parent_mid']) + if($obj['id'] != $obj['parent']) $post_type = t('comment'); break; } @@ -1536,7 +1536,11 @@ function network_tabs() { // tabs $tabs = array(); - if(! get_config('system','disable_discover_tab')) { + $d = get_config('system','disable_discover_tab'); + if($d === false) + $d = 1; + + if(! $d) { $tabs[] = array( 'label' => t('Discover'), 'url' => z_root() . '/' . $cmd . '?f=&fh=1' , |