summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-10-28 00:41:51 +0400
committerAndrew Dolgov <[email protected]>2012-10-28 00:41:51 +0400
commit7fdf8eca9900ae626291b9acc65aef2197af1a94 (patch)
treea44811e270dd6fc22b98de90c4f55e5d0d5dcd2a /include
parented66d60d96005910a008820f8bab54d4ea31d614 (diff)
multiple issues fixed in vfeed_group_by_feed
Diffstat (limited to 'include')
-rw-r--r--include/functions.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/functions.php b/include/functions.php
index 4c88c0350..656664da2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2559,9 +2559,12 @@
$offset_query_part = "OFFSET $offset";
}
+ // proper override_order applied above
if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) {
$order_by = "ttrss_feeds.title, $order_by";
+ } else {
+ $order_by = "ttrss_feeds.title, $override_order";
}
}