aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-13 15:21:11 -0800
committerfriendica <info@friendica.com>2011-12-13 15:21:11 -0800
commit4f2d516920b708ffedd9b8fc60e34b6f9326c644 (patch)
tree8866b2084c1e707f8fcd4cdc03e0094d281ce611
parentee4975f1cd9f205e2300f3e22e51079c5e26f155 (diff)
downloadvolse-hubzilla-4f2d516920b708ffedd9b8fc60e34b6f9326c644.tar.gz
volse-hubzilla-4f2d516920b708ffedd9b8fc60e34b6f9326c644.tar.bz2
volse-hubzilla-4f2d516920b708ffedd9b8fc60e34b6f9326c644.zip
liveupdate: only modify existing conversations if not page1
-rw-r--r--boot.php2
-rw-r--r--js/main.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index b02b0be98..c604e4f77 100644
--- 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 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'));
});