Browse Source

Only sort the profile after pinned

pull/7823/head
Michael 2 years ago
parent
commit
91ad7936f3
2 changed files with 18 additions and 10 deletions
  1. +17
    -9
      include/conversation.php
  2. +1
    -1
      src/Module/Profile.php

+ 17
- 9
include/conversation.php View File

@ -1451,7 +1451,9 @@ function conv_sort(array $item_list, $order)
}
}
if (stristr($order, 'received')) {
if (stristr($order, 'pinned_received')) {
usort($parents, 'sort_thr_pinned_received');
} elseif (stristr($order, 'received')) {
usort($parents, 'sort_thr_received');
} elseif (stristr($order, 'commented')) {
usort($parents, 'sort_thr_commented');
@ -1489,13 +1491,13 @@ function conv_sort(array $item_list, $order)
}
/**
* @brief usort() callback to sort item arrays by the received key
* @brief usort() callback to sort item arrays by pinned and the received key
*
* @param array $a
* @param array $b
* @return int
*/
function sort_thr_received(array $a, array $b)
function sort_thr_pinned_received(array $a, array $b)
{
if ($b['pinned'] && !$a['pinned']) {
return 1;
@ -1506,6 +1508,18 @@ function sort_thr_received(array $a, array $b)
return strcmp($b['received'], $a['received']);
}
/**
* @brief usort() callback to sort item arrays by the received key
*
* @param array $a
* @param array $b
* @return int
*/
function sort_thr_received(array $a, array $b)
{
return strcmp($b['received'], $a['received']);
}
/**
* @brief usort() callback to reverse sort item arrays by the received key
*
@ -1515,12 +1529,6 @@ function sort_thr_received(array $a, array $b)
*/
function sort_thr_received_rev(array $a, array $b)
{
if ($b['pinned'] && !$a['pinned']) {
return -1;
} elseif (!$b['pinned'] && $a['pinned']) {
return 1;
}
return strcmp($a['received'], $b['received']);
}


+ 1
- 1
src/Module/Profile.php View File

@ -355,7 +355,7 @@ class Profile extends BaseModule
$items = array_merge($items, $pinned);
}
$o .= conversation($a, $items, $pager, 'profile', $update, false, 'received', $a->profile['profile_uid']);
$o .= conversation($a, $items, $pager, 'profile', $update, false, 'pinned_received', $a->profile['profile_uid']);
if (!$update) {
$o .= $pager->renderMinimal(count($items));


Loading…
Cancel
Save