correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work

2 files changed, 28 insertions, 16 deletions

diff --git a/include/items.php b/include/items.php
index e26180641..fb2f2586a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -419,6 +419,9 @@ function post_activity_item($arr) {
 
 	$arr['verb']         = 	((x($arr,'verb')) ? $arr['verb'] : ACTIVITY_POST);
 	$arr['obj_type']     =  ((x($arr,'obj_type')) ? $arr['obj_type'] : ACTIVITY_OBJ_NOTE);
+	if($is_comment)
+		$arr['obj_type'] = ACTIVITY_OBJ_COMMENT;
+
 
 	$arr['allow_cid']    = ((x($arr,'allow_cid')) ? $arr['allow_cid'] : $channel['channel_allow_cid']);
 	$arr['allow_gid']    = ((x($arr,'allow_gid')) ? $arr['allow_gid'] : $channel['channel_allow_gid']);
@@ -2026,8 +2029,8 @@ function item_store($arr,$allow_exec = false) {
 	$arr['coord']         = ((x($arr,'coord'))         ? notags(trim($arr['coord']))         : '');
 	$arr['parent_mid']    = ((x($arr,'parent_mid'))    ? notags(trim($arr['parent_mid']))    : '');
 	$arr['thr_parent']    = ((x($arr,'thr_parent'))    ? notags(trim($arr['thr_parent']))    : $arr['parent_mid']);
-	$arr['verb']          = ((x($arr,'verb'))          ? notags(trim($arr['verb']))          : '');
-	$arr['obj_type']      = ((x($arr,'obj_type'))      ? notags(trim($arr['obj_type']))      : '');
+	$arr['verb']          = ((x($arr,'verb'))          ? notags(trim($arr['verb']))          : ACTIVITY_POST);
+	$arr['obj_type']      = ((x($arr,'obj_type'))      ? notags(trim($arr['obj_type']))      : ACTIVITY_OBJ_NOTE);
 	$arr['object']        = ((x($arr,'object'))        ? trim($arr['object'])                : '');
 	$arr['tgt_type']      = ((x($arr,'tgt_type'))      ? notags(trim($arr['tgt_type']))      : '');
 	$arr['target']        = ((x($arr,'target'))        ? trim($arr['target'])                : '');
@@ -2091,6 +2094,8 @@ function item_store($arr,$allow_exec = false) {
 				return $ret;
 			}
 
+			if($arr['obj_type'] == ACTIVITY_OBJ_NOTE)
+				$arr['obj_type'] = ACTIVITY_OBJ_COMMENT;
 
 			// is the new message multi-level threaded?
 			// even though we don't support it now, preserve the info
diff --git a/mod/item.php b/mod/item.php
index 7704d0ba6..b3370fecf 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -133,6 +133,9 @@ function item_post(&$a) {
 		if(! x($_REQUEST,'type'))
 			$_REQUEST['type'] = 'net-comment';
 
+		if($obj_type == ACTIVITY_OBJ_POST)
+			$obj_type = ACTIVITY_OBJ_COMMENT;
+
 		if($parent) {
 			$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
 				intval($parent)
@@ -579,20 +582,23 @@ function item_post(&$a) {
 		// Look for tags and linkify them
 		$results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid);
 
-		// Set permissions based on tag replacements
-		set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item);
-
-		$post_tags = array();
-		foreach($results as $result) {
-			$success = $result['success'];
-			if($success['replaced']) {
-				$post_tags[] = array(
-					'uid'   => $profile_uid, 
-					'type'  => $success['termtype'],
-					'otype' => TERM_OBJ_POST,
-					'term'  => $success['term'],
-					'url'   => $success['url']
-				); 				
+		if($results) {
+
+			// Set permissions based on tag replacements
+			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item);
+
+			$post_tags = array();
+			foreach($results as $result) {
+				$success = $result['success'];
+				if($success['replaced']) {
+					$post_tags[] = array(
+						'uid'   => $profile_uid, 
+						'type'  => $success['termtype'],
+						'otype' => TERM_OBJ_POST,
+						'term'  => $success['term'],
+						'url'   => $success['url']
+					); 				
+				}
 			}
 		}
 
@@ -700,6 +706,7 @@ function item_post(&$a) {
 	$datarray['location']       = $location;
 	$datarray['coord']          = $coord;
 	$datarray['verb']           = $verb;
+	$datarray['obj_type']       = $obj_type;
 	$datarray['allow_cid']      = $str_contact_allow;
 	$datarray['allow_gid']      = $str_group_allow;
 	$datarray['deny_cid']       = $str_contact_deny;