summaryrefslogtreecommitdiff
path: root/classes/api.php
diff options
context:
space:
mode:
authorBarak Korren <[email protected]>2013-04-02 20:38:07 +0300
committerBarak Korren <[email protected]>2013-04-02 20:38:07 +0300
commit58a2577d48790c79adfd44bcfd662c980ce6cfe4 (patch)
tree523d814ea0b7b6f617fe515b186099c6e83fed72 /classes/api.php
parente470a273cf09562fb2f9c0c899002303f19c8d16 (diff)
parentcc332603431102a682feda22b9cf0093a29f0176 (diff)
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
Diffstat (limited to 'classes/api.php')
-rw-r--r--classes/api.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/classes/api.php b/classes/api.php
index ea57a61ab..902cb0853 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -199,13 +199,23 @@ class API extends Handler {
$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
$sanitize_content = true;
+ $override_order = false;
+ switch ($_REQUEST["order_by"]) {
+ case "date_reverse":
+ $override_order = "date_entered, updated";
+ break;
+ case "feed_dates":
+ $override_order = "updated DESC";
+ break;
+ }
+
/* do not rely on params below */
$search = db_escape_string($this->link, $_REQUEST["search"]);
$search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]);
$headlines = $this->api_get_headlines($this->link, $feed_id, $limit, $offset,
- $filter, $is_cat, $show_excerpt, $show_content, $view_mode, false,
+ $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
$include_attachments, $since_id, $search, $search_mode,
$include_nested, $sanitize_content);