'mark seen' not getting all msgs on profile page

2 files changed, 10 insertions, 8 deletions

diff --git a/mod/network.php b/mod/network.php
index 7ad5058bf..16739b434 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -100,14 +100,16 @@ function network_content(&$a, $update = 0) {
 
 	}
 
-	// We aren't going to try and figure out at the item, group, and page level 
-	// which items you've seen and which you haven't. You're looking at some
-	// subset of items, so just mark everything seen. 
+	// We aren't going to try and figure out at the item, group, and page
+	// level which items you've seen and which you haven't. If you're looking
+	// at the top level network page just mark everything seen. 
 	
-	$r = q("UPDATE `item` SET `unseen` = 0 
-		WHERE `unseen` = 1 AND `uid` = %d",
-		intval($_SESSION['uid'])
-	);
+	if((! $group) && (! $cid)) {
+		$r = q("UPDATE `item` SET `unseen` = 0 
+			WHERE `unseen` = 1 AND `uid` = %d",
+			intval($_SESSION['uid'])
+		);
+	}
 
 	// We don't have to deal with ACL's on this page. You're looking at everything
 	// that belongs to you, hence you can see all of it. We will filter by group if
diff --git a/mod/profile.php b/mod/profile.php
index 340c96d86..634aec460 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -168,7 +168,7 @@ function profile_content(&$a, $update = 0) {
 		// Oh - while we're here... reset the Unseen messages
 
 		$r = q("UPDATE `item` SET `unseen` = 0 
-			WHERE `type` != 'remote' AND `unseen` = 1 AND `uid` = %d",
+			WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
 			intval($_SESSION['uid'])
 		);