tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Remove pager parameter from conversation()

Browse source 
- Add getUrlParameter() Javascript function to determine current page
This commit is contained in:
Hypolite Petovan 2020-02-13 23:40:00 -05:00
commit 0b0309ce8f
11 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/community.php
View file

@ -200,7 +200,7 @@ function community_content(App $a, $update = 0)
$s = $r;
}
$o .= conversation($a, $s, $pager, 'community', $update, false, 'commented', local_user());
$o .= conversation($a, $s, 'community', $update, false, 'commented', local_user());
if (!$update) {
$o .= $pager->renderMinimal(count($r));

2
mod/display.php
View file

@ -331,7 +331,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
$o .= "<script> var netargs = '?item_id=" . $item_id . "'; </script>";
}
$o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), 'display', $update_uid, false, 'commented', $item_uid);
$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', $item_uid);
// Preparing the meta header
$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));

2
mod/item.php
View file

@ -675,7 +675,7 @@ function item_post(App $a) {
$datarray["item_id"] = -1;
$datarray["author-network"] = Protocol::DFRN;
$o = conversation($a, [array_merge($contact_record, $datarray)], new Pager(DI::args()->getQueryString()), 'search', false, true);
$o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
System::jsonExit(['preview' => $o]);
}

2
mod/network.php
View file

@ -291,7 +291,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
$items = [];
}
$o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
$o = conversation($a, $items, $mode, $update, false, $ordering, local_user());
if (!$update) {
if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {

2
mod/notes.php
View file

@ -82,7 +82,7 @@ function notes_content(App $a, $update = false)
$count = count($notes);
$o .= conversation($a, $notes, $pager, 'notes', $update);
$o .= conversation($a, $notes, 'notes', $update);
}
$o .= $pager->renderMinimal($count);