Merge branch 'master' of git://github.com/friendika/friendika

include/items.php

@@ -637,7 +637,7 @@ function item_store($arr) {
 
 	$arr['body']          = str_replace(
 								array('&', '>', '<', '"'),
-								array('&'    , '>'    , '<',     '&quot'),
+								array('&'    , '>'    , '<',     '"'),
 								$arr['body']
 							);
 

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;
 		}
 	}
 		

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))