diff options
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 7 | ||||
| -rw-r--r-- | include/poller.php | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index f1169aeb4..5f8264beb 100644 --- a/include/items.php +++ b/include/items.php @@ -637,7 +637,7 @@ function item_store($arr) { $arr['body'] = str_replace( array('&amp;', '&gt;', '&lt;', '&quot;'), - array('&' , '>' , '<', '"'), + array('&' , '>' , '<', '"'), $arr['body'] ); diff --git a/include/notifier.php b/include/notifier.php index 39640e51a..4efdad4ce 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -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; } } diff --git a/include/poller.php b/include/poller.php index fc45ff9c3..8234becbb 100644 --- a/include/poller.php +++ b/include/poller.php @@ -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)) |