diff options
| author | Andrew Dolgov <[email protected]> | 2007-05-18 07:14:32 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2007-05-18 07:14:32 +0100 |
| commit | d2ca9130948093c04f4f6e0303d8bf981c62e50a (patch) | |
| tree | 2bf8a7929fd7a9574becf04d6a1ace0ccc78568a /modules | |
| parent | 400b60d8c23f41f9db3bf3f910b556448b9d0ccb (diff) | |
pref-feeds: block sorting by last_article when column is not present
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pref-feeds.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 3f5e2f61f..4594326bf 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -793,12 +793,6 @@ $search_qpart = ""; } - if (get_pref($link, 'ENABLE_FEED_CATS')) { - $order_by_qpart = "category,$feeds_sort,title"; - } else { - $order_by_qpart = "$feeds_sort,title"; - } - $show_last_article_info = false; $show_last_article_checked = ""; $show_last_article_qpart = ""; @@ -809,6 +803,14 @@ $show_last_article_qpart = ", (SELECT SUBSTRING(MAX(updated),1,16) FROM ttrss_user_entries, ttrss_entries WHERE ref_id = ttrss_entries.id AND feed_id = F1.id) AS last_article"; + } else if ($feeds_sort == "last_article") { + $feeds_sort = "title"; + } + + if (get_pref($link, 'ENABLE_FEED_CATS')) { + $order_by_qpart = "category,$feeds_sort,title"; + } else { + $order_by_qpart = "$feeds_sort,title"; } $result = db_query($link, "SELECT |