aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/External-Resources.md2
-rw-r--r--include/photo/photo_driver.php2
-rw-r--r--include/photos.php1
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/External-Resources.md b/doc/External-Resources.md
index d5bed17a2..9339d0352 100644
--- a/doc/External-Resources.md
+++ b/doc/External-Resources.md
@@ -8,7 +8,7 @@ External Resources
* [APW](https://github.com/beardy-unixer/apw)
* [Redstrap](https://github.com/omigeot/redstrap3)
* [Pluto](https://github.com/23n/Pluto)
-* [bootstrap](https://bitbucket.org/tobiasd/red-theme-bootstrap/overview)
+* [clean](https://bitbucket.org/tobiasd/red-clean)
**Third-Party Addons**
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);