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

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-06-02 22:39:36 +02:00
commit 3a9f149c80
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Widget/Activity_filter.php
View File

@ -102,7 +102,7 @@ class Activity_filter {
'icon' => 'folder', 'icon' => 'folder',
'url' => '#', 'url' => '#',
'sel' => (($filter_active == 'file') ? true : false), 'sel' => (($filter_active == 'file') ? true : false),
'title' => sprintf(t('Show posts that i have filed to %s'), $t['term']), 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']),
'sub' => $tsub 'sub' => $tsub
]; ];

2
Zotlabs/Widget/Forums.php
View File

@ -51,7 +51,7 @@ class Forums {
$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 $sql_extra order by xchan_name $limit ", $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name $limit ",
intval(local_channel()) intval(local_channel())
); );

9
include/connections.php
View File

@ -374,14 +374,19 @@ function contact_remove($channel_id, $abook_id) {
return false; return false;
$r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d", $r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0",
dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']),
dbesc($abook['abook_xchan']), dbesc($abook['abook_xchan']),
intval($channel_id) intval($channel_id)
); );
if($r) { if($r) {
$r = fetch_post_tags($r,true);
foreach($r as $rr) { foreach($r as $rr) {
drop_item($rr['id'],false); $terms = get_terms_oftype($item['term'],TERM_FILE);
if(! $terms) {
drop_item($rr['id'],false);
}
} }
} }