MensBeam
/
Arsse
3
1
Fork 0
Code Issues 24 Pull Requests Releases 28 Activity
Browse Source

Fix breakage caused by last comit

microsub
J. King 7 years ago
parent
a0bf7c16bd
commit
91165cdd0d
2 changed files with 12 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lib/Database.php
  2. 14
      tests/lib/Database/SeriesArticle.php

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",
], ],

Write Preview
Loading…
Cancel
Save