valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix http 304 header being calculated incorrectly for published and starred feeds

This commit is contained in:
Andrew Dolgov 2013-10-04 09:10:44 +04:00
parent 8b16eeb1a3
commit 84c53d0e1d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/handler/public.php
View File

@ -15,11 +15,15 @@ class Handler_Public extends Handler {
if (!$limit) $limit = 60; if (!$limit) $limit = 60;
$date_sort_field = "date_entered DESC, updated DESC"; $date_sort_field = "date_entered DESC, updated DESC";
$date_check_field = "date_entered";
if ($feed == -2) if ($feed == -2 && !$is_cat) {
$date_sort_field = "last_published DESC"; $date_sort_field = "last_published DESC";
else if ($feed == -1) $date_check_field = "last_published";
} else if ($feed == -1 && !$is_cat) {
$date_sort_field = "last_marked DESC"; $date_sort_field = "last_marked DESC";
$date_check_field = "last_marked";
}
switch ($order) { switch ($order) {
case "title": case "title":
@ -41,7 +45,8 @@ class Handler_Public extends Handler {
$result = $qfh_ret[0]; $result = $qfh_ret[0];
if ($this->dbh->num_rows($result) != 0) { if ($this->dbh->num_rows($result) != 0) {
$ts = strtotime($this->dbh->fetch_result($result, 0, "date_entered"));
$ts = strtotime($this->dbh->fetch_result($result, 0, $date_check_field));
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) { strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {