}
else
$nickname = $a->user['nickname'];
+
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
+ if($item['author-link'] && (! $item['author-name']))
+ $profile_name = $item['author-link'];
$sp = false;
$profile_link = best_link_url($item,$sp);
$arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr);
- $threads[$threadsid] .= $arr['output'];
+ $threads[$threadsid]['id'] = $item['item_id'];
+ $threads[$threadsid]['html'] .= $arr['output'];
}
$comments_collapsed = false;
$threadsid++;
- $threads[$threadsid] = "";
+ $threads[$threadsid]['id'] = $item['item_id'];
+ $threads[$threadsid]['html'] = "";
+
}
else {
// prevent private email from leaking into public conversation
// IMPORTANT: the closing </div> in the hide_comments template
// is supplied below in code.
- $threads[$threadsid] .= replace_macros($hide_comments_tpl,array(
+ $threads[$threadsid]['html'] .= replace_macros($hide_comments_tpl,array(
'$id' => $item['parent'],
'$num_comments' => sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),
$comments[$item['parent']]),
}
}
if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
- $threads[$threadsid] .= '</div>';
+ $threads[$threadsid]['html'] .= '</div>';
}
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
+ if($item['author-link'] && (! $item['author-name']))
+ $profile_name = $item['author-link'];
+
+
$sp = false;
$profile_link = best_link_url($item,$sp);
if($sp)
$arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr);
- $threads[$threadsid] .= $arr['output'];
+ $threads[$threadsid]['html'] .= $arr['output'];
}
}
}
- // if author collapsing is in force but didn't get closed, close it off now.
-
- /*if($blowhard_count >= 3)
- $threads[$threadsid] .= '</div>';*/
-
$page_template = get_markup_template("conversation.tpl");
$o .= replace_macros($page_template, array(
'$threads' => $threads,