Another try at issue #61 and #62 - an earlier fix was partially working but the issue persisted - this extends it a bit.

3 files changed, 49 insertions, 10 deletions

diff --git a/include/items.php b/include/items.php
index df49ba5c7..5137a8b31 100755
--- a/include/items.php
+++ b/include/items.php
@@ -773,14 +773,19 @@ function decode_tags($t) {
 
 function activity_sanitise($arr) {
 	if($arr) {
-		$ret = array();
-		foreach($arr as $k => $x) {
-			if(is_array($x))
-				$ret[$k] = activity_sanitise($x);
-			else
-				$ret[$k] = htmlentities($x, ENT_COMPAT,'UTF-8',false);
+		if(is_array($arr)) {
+			$ret = array();
+			foreach($arr as $k => $x) {
+				if(is_array($x))
+					$ret[$k] = activity_sanitise($x);
+				else
+					$ret[$k] = htmlentities($x, ENT_COMPAT,'UTF-8',false);
+			}
+			return $ret;
+		}
+		else {
+			return htmlentities($arr, ENT_COMPAT,'UTF-8', false);
 		}
-		return $ret;
 	}
 	return '';
 }
@@ -1572,10 +1577,10 @@ function item_store($arr,$allow_exec = false) {
 		unset($arr['term']);
 	}
 
-	dbesc_array($arr);
-
 	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
 
+	dbesc_array($arr);
+
 	$r = dbq("INSERT INTO `item` (`" 
 			. implode("`, `", array_keys($arr)) 
 			. "`) VALUES ('" 
diff --git a/js/main.js b/js/main.js
index 2d1e9ab76..9d764c74e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -343,6 +343,8 @@
 
 function updateConvItems(mode,data) {
 
+
+
 	if(mode === 'update') {
 		prev = 'threads-begin';
 
@@ -391,15 +393,31 @@ function updateConvItems(mode,data) {
 		});
 	}
 	if(mode === 'append') {
+
 		next = 'threads-end';
+
+
+
 		$('.thread-wrapper.toplevel_item',data).each(function() {
+
+
 			var ident = $(this).attr('id');
+			var commentWrap = $('#'+ident+' .collapsed-comments').attr('id');
+			var itmId = 0;
+			var isVisible = false;
+
+			if(typeof commentWrap !== 'undefined')
+				itmId = commentWrap.replace('collapsed-comments-','');
 
 			if($('#' + ident).length == 0) {
 				$('img',this).each(function() {
 					$(this).attr('src',$(this).attr('dst'));
 				});
+				if($('#collapsed-comments-'+itmId).is(':visible'))
+					isVisible = true;
 				$('#threads-end').before($(this));
+				if(isVisible)
+					showHideComments(itmId);
 				$(".autotime").timeago();
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 
@@ -408,7 +426,11 @@ function updateConvItems(mode,data) {
 				$('img',this).each(function() {
 					$(this).attr('src',$(this).attr('dst'));
 				});
+				if($('#collapsed-comments-'+itmId).is(':visible'))
+					isVisible = true;
 				$('#' + ident).replaceWith($(this));
+				if(isVisible)
+					showHideComments(itmId);
 				$(".autotime").timeago();
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 			}
@@ -425,13 +447,25 @@ function updateConvItems(mode,data) {
 		prev = 'threads-begin';
 
 		$('.thread-wrapper.toplevel_item',data).each(function() {
+
 			var ident = $(this).attr('id');
+			var commentWrap = $('#'+ident+' .collapsed-comments').attr('id');
+			var itmId = 0;
+			var isVisible = false;
+
+			if(typeof commentWrap !== 'undefined')
+				itmId = commentWrap.replace('collapsed-comments-','');
 
 			if($('#' + ident).length == 0 && profile_page == 1) {
 				$('img',this).each(function() {
 					$(this).attr('src',$(this).attr('dst'));
 				});
+
+				if($('#collapsed-comments-'+itmId).is(':visible'))
+					isVisible = true;
 				$('#' + prev).after($(this));
+				if(isVisible)
+					showHideComments(itmId);
 				$(".autotime").timeago();
 
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
diff --git a/version.inc b/version.inc
index 6e830d804..7f9c7a59b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-08-17.408
+2013-08-18.409