harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/red

Browse Source 
to be in sync with main repro
This commit is contained in:
Michael Meer 2014-01-23 12:11:45 +01:00
commit f870de31a4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/External-Resources.md
View File

@ -8,7 +8,7 @@ External Resources
* [APW](https://github.com/beardy-unixer/apw) * [APW](https://github.com/beardy-unixer/apw)
* [Redstrap](https://github.com/omigeot/redstrap3) * [Redstrap](https://github.com/omigeot/redstrap3)
* [Pluto](https://github.com/23n/Pluto) * [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** **Third-Party Addons**

2
include/photo/photo_driver.php
View File

@ -357,7 +357,7 @@ abstract class photo_driver {
dbesc($p['resource_id']), dbesc($p['resource_id']),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(basename($filename)), dbesc(basename($p['filename'])),
dbesc($this->getType()), dbesc($this->getType()),
dbesc($p['album']), dbesc($p['album']),
intval($this->getHeight()), intval($this->getHeight()),

1
include/photos.php
View File

@ -77,6 +77,7 @@ function photo_upload($channel, $observer, $args) {
$filesize = intval($_FILES['userfile']['size']); $filesize = intval($_FILES['userfile']['size']);
$type = $_FILES['userfile']['type']; $type = $_FILES['userfile']['type'];
} }
if (! $type) if (! $type)
$type=guess_image_type($filename); $type=guess_image_type($filename);