fix notice in action with caching

This commit is contained in:
Evan Prodromou 2009-02-26 13:36:27 -08:00
parent 2bf5b23016
commit ee92d0b0a8

View File

@ -812,11 +812,12 @@ class Action extends HTMLOutputter // lawsuit
} }
if ($lm) { if ($lm) {
header('Last-Modified: ' . date(DATE_RFC1123, $lm)); header('Last-Modified: ' . date(DATE_RFC1123, $lm));
$if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE']; if (array_key_exists('HTTP_IF_MODIFIED_SINCE', $_SERVER)) {
if ($if_modified_since) { $if_modified_since = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
$ims = strtotime($if_modified_since); $ims = strtotime($if_modified_since);
if ($lm <= $ims) { if ($lm <= $ims) {
$if_none_match = $_SERVER['HTTP_IF_NONE_MATCH']; $if_none_match = (array_key_exists('HTTP_IF_NONE_MATCH', $_SERVER)) ?
$_SERVER['HTTP_IF_NONE_MATCH'] : null;
if (!$if_none_match || if (!$if_none_match ||
!$etag || !$etag ||
$this->_hasEtag($etag, $if_none_match)) { $this->_hasEtag($etag, $if_none_match)) {