diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
| commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
| tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /inc/JpegMeta.php | |
| parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
| parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
| download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'inc/JpegMeta.php')
| -rw-r--r-- | inc/JpegMeta.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index afa70168c..5c043fb6b 100644 --- a/inc/JpegMeta.php +++ b/inc/JpegMeta.php @@ -1207,7 +1207,7 @@ class JpegMeta { * @author Andreas Gohr <andi@splitbrain.org> */ function _parseFileInfo() { - if (file_exists($this->_fileName)) { + if (file_exists($this->_fileName) && is_file($this->_fileName)) { $this->_info['file'] = array(); $this->_info['file']['Name'] = basename($this->_fileName); $this->_info['file']['Path'] = fullpath($this->_fileName); |