liveupdate: only modify existing conversations if not page1

diff --git a/boot.php b/boot.php
index b02b0be982886afbaf14d373b091c8ba4de9da71..c604e4f77eefb7a19d82be2531167be8badda1d7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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 3f84ae6c483b4b8be3f43eb9d15112ba88057f2e..65d05e58ad9bc1a36693e27fc1c925d369b5bb97 100644 (file)
--- 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'));
                                        });