bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Browse source 
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-21 20:01:51 +01:00
commit 0436782e70
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
5 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/proxy.php
View file

@ -140,17 +140,23 @@ function proxy_init(App $a) {
if (!$direct_cache AND ($cachefile == '')) {
$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
if (dbm::is_result($r)) {
<<<<<<< HEAD
<<<<<<< origin/rewrites/app_get_baseurl_static
$img_str = $r[0]['data'];
$mime = $r[0]["desc"];
if ($mime == "") $mime = "image/jpeg";
=======
=======
>>>>>>> upstream/develop
$img_str = $r[0]['data'];
$mime = $r[0]['desc'];
if ($mime == '') {
$mime = 'image/jpeg';
}
<<<<<<< HEAD
>>>>>>> HEAD~0
=======
>>>>>>> upstream/develop
}
} else {
$r = array();