aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-10 00:44:34 -0800
committerfriendica <info@friendica.com>2015-02-10 00:44:34 -0800
commitf7cce634479bb95258209a6aadb9becd3c6b94a3 (patch)
treeb1f6fac13e966ddf3045dcd74c4c9031214aef2b /include
parent81e7b47b76e6cc72995e910190e4164d28ec5664 (diff)
downloadvolse-hubzilla-f7cce634479bb95258209a6aadb9becd3c6b94a3.tar.gz
volse-hubzilla-f7cce634479bb95258209a6aadb9becd3c6b94a3.tar.bz2
volse-hubzilla-f7cce634479bb95258209a6aadb9becd3c6b94a3.zip
cleanup event attendance - make sure it works in list mode.
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php17
1 files changed, 4 insertions, 13 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 308b56586..b777e479b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -784,15 +784,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if(feature_enabled($profile_owner, 'dislike'))
like_puller($a, $item, $conv_responses, 'dislike');
- if($item['obj_type'] === ACTIVITY_OBJ_EVENT) {
- like_puller($a, $item, $conv_responses, 'attendyes');
- like_puller($a, $item, $conv_responses, 'attendno');
- like_puller($a, $item, $conv_responses, 'attendmaybe');
-
-logger('responses: ' . print_r($conv_responses,true));
-
- }
-
+ like_puller($a, $item, $conv_responses, 'attendyes');
+ like_puller($a, $item, $conv_responses, 'attendno');
+ like_puller($a, $item, $conv_responses, 'attendmaybe');
like_puller($a, $item, $conv_responses, 'agree');
like_puller($a, $item, $conv_responses, 'disagree');
like_puller($a, $item, $conv_responses, 'abstain');
@@ -1024,12 +1018,9 @@ function like_puller($a, $item, &$arr, $mode) {
return;
break;
}
-logger('verb: ' . $verb);
-if($verb === ACTIVITY_ATTENDNO)
- logger('item: ' . $item['verb']);
if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
-logger('match:' . $verb);
+
if($item['author']['xchan_url'])
$url = chanlink_url($item['author']['xchan_url']);