harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undefined activity_compare which broke notifications (should be activity_match) and revamp xchan_query as abook is optional and need not be present - if it isn't there we still need the xchan, but if it is there we need to make sure that it belongs to whichever channel owns the post

Browse Source
This commit is contained in:
friendica 2013-06-20 15:55:20 -07:00
parent 3dcf9a1df7
commit 95d7514633
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/text.php
View File

@ -1440,7 +1440,7 @@ function item_post_type($item) {
break; break;
} }
if(strlen($item['verb']) && (! activity_compare($item['verb'],ACTIVITY_POST))) if(strlen($item['verb']) && (! activity_match($item['verb'],ACTIVITY_POST)))
$post_type = t('activity'); $post_type = t('activity');
return $post_type; return $post_type;
@ -1556,8 +1556,8 @@ function xchan_query(&$items,$abook = true) {
} }
if(count($arr)) { if(count($arr)) {
if($abook) { if($abook) {
$chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash and abook_channel = %d
where abook_channel = %d and xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )", where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )",
intval($item['uid']) intval($item['uid'])
); );
} }