aboutsummaryrefslogtreecommitdiffstats
path: root/include/photos.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-11-20 14:27:20 +0100
committerMario Vavti <mario@mariovavti.com>2017-11-20 14:27:20 +0100
commit0325efeb350f575f70f18e9f199ad273e5ba1d15 (patch)
tree742ffbc2b46a31547f114124546353d3b1102157 /include/photos.php
parent9ab33f1e134e6e7694a42b92fc9d73c2e6dcffd1 (diff)
parent250d947667b1500633d80b043ac3760be21446fc (diff)
downloadvolse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.tar.gz
volse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.tar.bz2
volse-hubzilla-0325efeb350f575f70f18e9f199ad273e5ba1d15.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/photos.php')
-rw-r--r--include/photos.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php
index 41a1d18cb..b1391f284 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -203,7 +203,13 @@ function photo_upload($channel, $observer, $args) {
return $ret;
}
- $exif = $ph->orient(($args['os_syspath']) ? $args['os_syspath'] : $src);
+ // obtain exif data from the source file if present
+
+ $exif = $ph->exif(($args['os_syspath']) ? $args['os_syspath'] : $src);
+
+ if($exif) {
+ $ph->orient($exif);
+ }
@unlink($src);