|
|
|
@ -2250,7 +2250,7 @@
|
|
|
|
|
|
|
|
|
|
$view_query_part = "";
|
|
|
|
|
|
|
|
|
|
if ($view_mode == "adaptive" || $view_query_part == "noscores") {
|
|
|
|
|
if ($view_mode == "adaptive") {
|
|
|
|
|
if ($search) {
|
|
|
|
|
$view_query_part = " ";
|
|
|
|
|
} else if ($feed != -1) {
|
|
|
|
@ -2282,10 +2282,6 @@
|
|
|
|
|
$view_query_part = " unread = true AND ";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($view_mode == "updated") {
|
|
|
|
|
$view_query_part = " (last_read is null and unread = false) AND ";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($limit > 0) {
|
|
|
|
|
$limit_query_part = "LIMIT " . $limit;
|
|
|
|
|
}
|
|
|
|
@ -2426,10 +2422,6 @@
|
|
|
|
|
|
|
|
|
|
$order_by = "$date_sort_field DESC, updated DESC";
|
|
|
|
|
|
|
|
|
|
if ($view_mode != "noscores") {
|
|
|
|
|
$order_by = "score DESC, $order_by";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($view_mode == "unread_first") {
|
|
|
|
|
$order_by = "unread DESC, $order_by";
|
|
|
|
|
}
|
|
|
|
|