aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-22 23:54:14 -0800
committerfriendica <info@friendica.com>2014-01-22 23:54:14 -0800
commitbf8e73ca739d60a9c80acb007d794d0a80c3e5ac (patch)
treef30b68e1dda2e25799ec4765d3d24db52dea0014
parentbc98f4ddf4cdfa655385c705d97fa006ada9c49f (diff)
downloadvolse-hubzilla-bf8e73ca739d60a9c80acb007d794d0a80c3e5ac.tar.gz
volse-hubzilla-bf8e73ca739d60a9c80acb007d794d0a80c3e5ac.tar.bz2
volse-hubzilla-bf8e73ca739d60a9c80acb007d794d0a80c3e5ac.zip
missing filename in uploaded photos (we don't really use this, but we will need to have a filename to export via DAV or API and the original filename would be the most likely choice).
-rw-r--r--include/photo/photo_driver.php2
-rw-r--r--include/photos.php1
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);