Merge pull request #52 from ggoffy/master

- fixed bug in extract exif
XoopsModules25x · May 23, 2020 · e301a09 · e301a09
2 parents 92c38da + d0fb65b
commit e301a09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/class/ImagesHandler.php b/class/ImagesHandler.php
@@ -166,7 +166,7 @@ public function exifExtractTags($exifs, $exif_tags)
     {
         $ret = '';
 
-        if (is_array($exifs)) {
+        if (is_object($exifs) || is_array($exifs)) {
             foreach ($exifs as $key => $value) {
                 if (in_array($key, $exif_tags)) {
                     if (is_array($value)) {

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -21,6 +21,7 @@
  - fixed perm for album list in image editor (lupin/goffy)
  - fixed perm bug for moving image from one to another album (lupin/goffy)
  - fixed bug in nested sorting (lupin/goffy)
+ - fixed bug in extract exif (lupin/goffy)
 
 <h5>1.14 RC1</h5>  [2019/11/09]
 <hr>