From da388f4bc5bd3a1aaea3c54b94fe1f8e4cf10561 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Feb 2013 17:46:04 -0800 Subject: fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right. --- include/conversation.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index 179bc8e0f..03f53980d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -583,6 +583,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { //$tmp_item = replace_macros($tpl,array( $tmp_item = array( 'template' => $tpl, + 'toplevel' => 'toplevel_item', 'tags' => $tags, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url), @@ -632,8 +633,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $arr = array('item' => $item, 'output' => $tmp_item); call_hooks('display_item', $arr); - $threads[$threadsid]['id'] = $item['item_id']; - $threads[$threadsid]['items'] = array($arr['output']); +// $threads[$threadsid]['id'] = $item['item_id']; + $threads[] = $arr['output']; } @@ -705,6 +706,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { if($page_mode === 'preview') logger('preview: ' . print_r($threads,true)); +// logger('page_template: ' . $page_template); // logger('nouveau: ' . print_r($threads,true)); @@ -720,8 +722,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { '$dropping' => ($page_dropping?t('Delete Selected Items'):False), )); - if($page_mode === 'preview') - logger('preview: ' . $o); +// if($page_mode === 'preview') +// logger('preview: ' . $o); return $o; -- cgit v1.2.3