diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-30 16:05:43 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-30 16:05:43 +0200 |
| commit | 9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch) | |
| tree | 073576560eaa6e00266c3e85a5e76df6e1dca032 /include | |
| parent | 05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff) | |
| parent | 18da7efa27fcff8fb2b3b679938954e712427de9 (diff) | |
| download | volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2 volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip | |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/main.js | 20 | ||||
| -rw-r--r-- | include/poller.php | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/include/items.php b/include/items.php index 051659321..4a740e55b 100644 --- a/include/items.php +++ b/include/items.php @@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { if(! $rino_enable) $rino = 0; - $url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : ''); + $url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : ''); logger('dfrn_deliver: ' . $url); diff --git a/include/main.js b/include/main.js index 824f2dfdf..750cce74c 100644 --- a/include/main.js +++ b/include/main.js @@ -113,12 +113,18 @@ $.get(update_url,function(data) { in_progress = false; + $('.ccollapse-wrapper',data).each(function() { + var ident = $(this).attr('id'); + if($('#' + ident).length) { + $('#' + ident).replaceWith($(this)); + } + }); $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); if($('#' + ident).length == 0) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); $('#' + prev).after($(this)); } else { @@ -127,11 +133,9 @@ $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper')); $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like')); $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike')); - $('#' + ident + ' ' + '.my-comment-photo').each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - - + $('#' + ident + ' ' + '.my-comment-photo').each(function() { + $(this).attr('src',$(this).attr('dst')); + }); } prev = ident; }); diff --git a/include/poller.php b/include/poller.php index 8619697d9..98c55a2a9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -167,7 +167,7 @@ function poller_run($argv, $argc){ if(intval($contact['duplex']) && $contact['issued-id']) $idtosend = '1:' . $orig_id; - $url = $contact['poll'] . '?dfrn_id=' . $idtosend + $url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=data&last_update=' . $last_update ; |