diff options
| author | Michael Meer <michael@meer.name> | 2014-01-23 12:11:45 +0100 |
|---|---|---|
| committer | Michael Meer <michael@meer.name> | 2014-01-23 12:11:45 +0100 |
| commit | f870de31a489f1bafcbd92482cc4e0a2f10eed60 (patch) | |
| tree | 847ac16e28ad60d245c47f6942f4f2838234d9d9 /include | |
| parent | 524fff3a17fec184c87e855d09bf6a60f68e4e88 (diff) | |
| parent | 420b330e55617ee9b968cbaeeb828f559cb8c56d (diff) | |
| download | volse-hubzilla-f870de31a489f1bafcbd92482cc4e0a2f10eed60.tar.gz volse-hubzilla-f870de31a489f1bafcbd92482cc4e0a2f10eed60.tar.bz2 volse-hubzilla-f870de31a489f1bafcbd92482cc4e0a2f10eed60.zip | |
Merge branch 'master' of https://github.com/friendica/red
to be in sync with main repro
Diffstat (limited to 'include')
| -rw-r--r-- | include/photo/photo_driver.php | 2 | ||||
| -rw-r--r-- | include/photos.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index ff92e5a0f..c2eeafa54 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -357,7 +357,7 @@ abstract class photo_driver { dbesc($p['resource_id']), dbesc(datetime_convert()), dbesc(datetime_convert()), - dbesc(basename($filename)), + dbesc(basename($p['filename'])), dbesc($this->getType()), dbesc($p['album']), intval($this->getHeight()), diff --git a/include/photos.php b/include/photos.php index eebddd393..82af4aaeb 100644 --- a/include/photos.php +++ b/include/photos.php @@ -77,6 +77,7 @@ function photo_upload($channel, $observer, $args) { $filesize = intval($_FILES['userfile']['size']); $type = $_FILES['userfile']['type']; } + if (! $type) $type=guess_image_type($filename); |