summaryrefslogtreecommitdiff
path: root/inc/JpegMeta.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/JpegMeta.php')
-rw-r--r--inc/JpegMeta.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index e660afd69..c8477fa9f 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -571,8 +571,20 @@ class JpegMeta
function getDates()
{
$this->_parseAll();
-
if ($this->_markers == null) {
+ if (@isset($this->_info['file']['UnixTime'])) {
+ $dates['FileModified'] = $this->_info['file']['UnixTime'];
+ $dates['Time'] = $this->_info['file']['UnixTime'];
+ $dates['TimeSource'] = 'FileModified';
+ $dates['TimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+ $dates['EarliestTime'] = $this->_info['file']['UnixTime'];
+ $dates['EarliestTimeSource'] = 'FileModified';
+ $dates['EarliestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+ $dates['LatestTime'] = $this->_info['file']['UnixTime'];
+ $dates['LatestTimeSource'] = 'FileModified';
+ $dates['LatestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+ return $dates;
+ }
return false;
}
@@ -895,9 +907,9 @@ class JpegMeta
function _readJPEG()
{
unset($this->_markers);
- unset($this->_info);
+ //unset($this->_info);
$this->_markers = array();
- $this->_info = array();
+ //$this->_info = array();
$this->_fp = @fopen($this->_fileName, 'rb');
if ($this->_fp) {