bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

add google buzz

Browse source
This commit is contained in:
Friendika 2010-11-21 15:25:10 -08:00
commit f1630780e9
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/acl_selectors.php
View file

@ -40,7 +40,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$sql_extra = '';
if($privmail || $celeb) {
$sql_extra = sprintf(" AND `rel` = %d ", intval(REL_BUD));
$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
}
if($privmail)
@ -49,7 +49,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" >\r\n";
$r = q("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
$sql_extra
ORDER BY `name` ASC ",
intval(local_user())

10
include/notifier.php
View file

@ -257,7 +257,7 @@
$deliver_status = dfrn_deliver($owner,$contact,$atom);
break;
default:
if($followup) {
if($followup && $contact['notify']) {
slapper($owner,$contact['notify'],$slap);
}
else {
@ -268,7 +268,9 @@
if(count($slaps) && $notify_hub) {
logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
slapper($owner,$contact['notify'],$slappy);
if($contact['notify']) {
slapper($owner,$contact['notify'],$slappy);
}
}
}
}
@ -289,7 +291,9 @@
foreach($url_recipients as $url) {
logger('notifier: urldelivery: ' . $url);
foreach($slaps as $slappy) {
slapper($owner,$url,$slappy);
if($url) {
slapper($owner,$url,$slappy);
}
}
}
}