mirror/Arsse
1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00
Code Issues Activity

Fix breakage caused by last comit

Browse source
This commit is contained in:
J. King 2017-11-27 15:05:50 -05:00
parent a0bf7c16bd
commit 91165cdd0d
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Database.php
View file

@ -1021,13 +1021,17 @@ class Database {
"url_title_hash||':'||url_content_hash||':'||title_content_hash as fingerprint", "url_title_hash||':'||url_content_hash||':'||title_content_hash as fingerprint",
]); ]);
case self::LIST_MINIMAL: // base metadata (always included: required for context matching) case self::LIST_MINIMAL: // base metadata (always included: required for context matching)
// id, subscription, feed, modified_date, marked_date, unread, starred, edition $columns = array_merge($columns,[
// id, subscription, feed, modified_date, marked_date, unread, starred, edition
"edited as edited_date",
]);
break; break;
default: default:
throw new Exception("constantUnknown", $fields); throw new Exception("constantUnknown", $fields);
} }
$q = $this->articleQuery($user, $context, $columns); $q = $this->articleQuery($user, $context, $columns);
$q->setOrder("edited_date".($context->reverse ? " desc" : "")); $q->setOrder("edited_date".($context->reverse ? " desc" : ""));
$q->setOrder("edition".($context->reverse ? " desc" : ""));
$q->setJoin("left join arsse_enclosures on arsse_enclosures.article is arsse_articles.id"); $q->setJoin("left join arsse_enclosures on arsse_enclosures.article is arsse_articles.id");
// perform the query and return results // perform the query and return results
return $this->db->prepare($q->getQuery(), $q->getTypes())->run($q->getValues()); return $this->db->prepare($q->getQuery(), $q->getTypes())->run($q->getValues());

14
tests/lib/Database/SeriesArticle.php
View file

@ -364,20 +364,20 @@ trait SeriesArticle {
]; ];
protected $fields = [ protected $fields = [
Database::LIST_MINIMAL => [ Database::LIST_MINIMAL => [
"id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "edited_date",
], ],
Database::LIST_CONSERVATIVE => [ Database::LIST_CONSERVATIVE => [
"id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "edited_date",
"url", "title", "subscription_title", "author", "guid", "published_date", "edited_date", "fingerprint", "url", "title", "subscription_title", "author", "guid", "published_date", "fingerprint",
], ],
Database::LIST_TYPICAL => [ Database::LIST_TYPICAL => [
"id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "edited_date",
"url", "title", "subscription_title", "author", "guid", "published_date", "edited_date", "fingerprint", "url", "title", "subscription_title", "author", "guid", "published_date", "fingerprint",
"content", "media_url", "media_type", "content", "media_url", "media_type",
], ],
Database::LIST_FULL => [ Database::LIST_FULL => [
"id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "id", "subscription", "feed", "modified_date", "marked_date", "unread", "starred", "edition", "edited_date",
"url", "title", "subscription_title", "author", "guid", "published_date", "edited_date", "fingerprint", "url", "title", "subscription_title", "author", "guid", "published_date", "fingerprint",
"content", "media_url", "media_type", "content", "media_url", "media_type",
"note", "note",
], ],