diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | js/main.js | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1193' ); +define ( 'FRIENDICA_VERSION', '2.3.1194' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1111 ); diff --git a/js/main.js b/js/main.js index 3f84ae6c4..65d05e58a 100644 --- a/js/main.js +++ b/js/main.js @@ -256,7 +256,8 @@ $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); - if($('#' + ident).length == 0) { + // If not on page 1, only add new conversation items to existing conversations on this page + if($('#' + ident).length == 0 && (profile_page == 1 || prev != 'live-' + src)) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); |