sforkowany z mirror/friendica
Merge branch 'master' of git://github.com/friendika/friendika
commit
2319bc43bf
|
@ -637,7 +637,7 @@ function item_store($arr) {
|
|||
|
||||
$arr['body'] = str_replace(
|
||||
array('&', '>', '<', '"'),
|
||||
array('&' , '>' , '<', '"'),
|
||||
array('&' , '>' , '<', '"'),
|
||||
$arr['body']
|
||||
);
|
||||
|
||||
|
|
|
@ -280,7 +280,7 @@
|
|||
);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
case 'stat':
|
||||
if($followup && $contact['notify']) {
|
||||
logger('notifier: slapdelivery: ' . $contact['name']);
|
||||
$deliver_status = slapper($owner,$contact['notify'],$slap);
|
||||
|
@ -324,6 +324,11 @@
|
|||
}
|
||||
}
|
||||
break;
|
||||
case 'mail':
|
||||
case 'dspr':
|
||||
case 'feed':
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
// 'stat' clause is a temporary measure until we have federation subscriptions working both directions
|
||||
$contacts = q("SELECT * FROM `contact`
|
||||
WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
|
||||
OR ( `network` = 'stat' AND `poll` != '' ) )
|
||||
OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' ))
|
||||
AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
|
||||
|
||||
if(! count($contacts))
|
||||
|
|
Ładowanie…
Reference in New Issue