friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

method, not property

This commit is contained in:
Domovoy 2012-08-24 04:57:32 +02:00
parent e3ee997cd3
commit c9cfc52293
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/conversation.php
View File

@ -521,7 +521,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$owner_url = zrl($matches[0][1]); $owner_url = zrl($matches[0][1]);
$owner_name = $matches[0][2]; $owner_name = $matches[0][2];
// Use the nosign // Use the nosign
$owner_photo = $a->get_baseurl .'/images/nosign.jpg'; $owner_photo = $a->get_baseurl() .'/images/nosign.jpg';
} }
} }
} }
@ -910,22 +910,41 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// Normal View // Normal View
$page_template = get_markup_template("threaded_conversation.tpl"); $page_template = get_markup_template("threaded_conversation.tpl");
require_once('object/Conversation.php');
require_once('object/Item.php');
$conv = new Conversation($mode);
// get all the topmost parents // get all the topmost parents
// this shouldn't be needed, as we should have only them in ou array // this shouldn't be needed, as we should have only them in our array
// But for now, this array respects the old style, just in case // But for now, this array respects the old style, just in case
$threads = array(); $threads = array();
foreach($items as $item) { foreach($items as $item) {
// Can we put this after the visibility check?
like_puller($a,$item,$alike,'like'); like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike'); like_puller($a,$item,$dlike,'dislike');
// Only add what is visible
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
continue;
}
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
continue;
}
if($item['id'] == $item['parent']) { if($item['id'] == $item['parent']) {
$threads[] = $item; $item_object = new Item($item);
$conv->add_thread($item_object);
} }
} }
$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike); $threads = $conv->get_template_data($alike, $dlike);
if(!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
$threads = array();
}
} }
} }