Merge branch 'master' into tres

Conflicts:
	include/notifier.php

1 files changed, 9 insertions, 3 deletions

diff --git a/include/items.php b/include/items.php
index 1eb1a6446..98596cede 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4409,7 +4409,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 	$limit = " LIMIT 100 ";
 
 	if($mindate != NULL_DATE) {
-		$sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) ";
+		$sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) ";
 	}
 
 	if($message_id) {
@@ -4427,7 +4427,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 
 	if(is_sys_channel($uid)) {
 		require_once('include/security.php');
-		$r = q("SELECT parent, created from item
+		$r = q("SELECT parent, created, postopts from item
 			WHERE uid != %d
 			and uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND item_restrict = 0 
 			AND item_wall = 1
@@ -4436,7 +4436,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 		);
 	}
 	else {
-		$r = q("SELECT parent, created from item
+		$r = q("SELECT parent, created, postopts from item
 			WHERE uid = %d AND item_restrict = 0
 			AND item_wall = 1
 			$sql_extra GROUP BY parent ORDER BY created ASC $limit",
@@ -4445,6 +4445,12 @@ function zot_feed($uid,$observer_xchan,$arr) {
 	}
 
 	if($r) {
+		for($x = 0; $x < count($r); $x ++) {
+			if(strpos($r[$x]['postopts'],'nodeliver') !== false) {
+				unset($r[$x]);
+			}
+		}
+	
 		$parents_str = ids_to_querystr($r,'parent');
 		$sys_query = ((is_sys_channel($uid)) ? $sql_extra : '');