Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Prevent Warning 

Error: Call to a member function getTimestamp() on boolean in islandora_view_datastream_cache_check()
pull/704/head
Jonathan Green 7 years ago committed by GitHub
parent
e2fd2fb892
commit
42fa70c303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 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. 2
      includes/datastream.inc

2
includes/datastream.inc
Unescape View File

@ -161,6 +161,7 @@ function islandora_view_datastream_cache_check(AbstractDatastream $datastream) {
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
$modified_since = DateTime::createFromFormat('D, d M Y H:i:s e', $_SERVER['HTTP_IF_MODIFIED_SINCE']); $modified_since = DateTime::createFromFormat('D, d M Y H:i:s e', $_SERVER['HTTP_IF_MODIFIED_SINCE']);
if ($modified_since !== FALSE) {
if ($datastream->createdDate->getTimestamp() - $modified_since->getTimestamp() > 0) { if ($datastream->createdDate->getTimestamp() - $modified_since->getTimestamp() > 0) {
// Changed! // Changed!
return $return; return $return;
@ -169,6 +170,7 @@ function islandora_view_datastream_cache_check(AbstractDatastream $datastream) {
$return = 304; $return = 304;
} }
} }
}
if ($return === 200 && isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE'])) { if ($return === 200 && isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE'])) {
$unmodified_since = DateTime::createFromFormat('D, d M Y H:i:s e', $_SERVER['HTTP_IF_UNMODIFIED_SINCE']); $unmodified_since = DateTime::createFromFormat('D, d M Y H:i:s e', $_SERVER['HTTP_IF_UNMODIFIED_SINCE']);
if ($datastream->createdDate->getTimestamp() !== $unmodified_since->getTimestamp()) { if ($datastream->createdDate->getTimestamp() !== $unmodified_since->getTimestamp()) {

Write Preview
Loading…
Cancel
Save