adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Combine variable defaults

Browse source
This commit is contained in:
Joe 2018-08-21 15:29:04 -04:00
parent a4e71b3b40
commit 8e7bc7701c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Network/CakeResponse.php
View file

@ -1162,15 +1162,13 @@ class CakeResponse {
public function checkNotModified(CakeRequest $request) { public function checkNotModified(CakeRequest $request) {
$etags = preg_split('/\s*,\s*/', $request->header('If-None-Match'), null, PREG_SPLIT_NO_EMPTY); $etags = preg_split('/\s*,\s*/', $request->header('If-None-Match'), null, PREG_SPLIT_NO_EMPTY);
$modifiedSince = $request->header('If-Modified-Since'); $modifiedSince = $request->header('If-Modified-Since');
$etagMatches = $timeMatches = false;
if ($responseTag = $this->etag()) { if ($responseTag = $this->etag()) {
$etagMatches = in_array('*', $etags) || in_array($responseTag, $etags); $etagMatches = in_array('*', $etags) || in_array($responseTag, $etags);
} else { } else {
$etagMatches = false;
} }
if ($modifiedSince) { if ($modifiedSince) {
$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince); $timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
} else {
$timeMatches = false;
} }
$checks = compact('etagMatches', 'timeMatches'); $checks = compact('etagMatches', 'timeMatches');
if (empty($checks)) { if (empty($checks)) {