friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

removed conflict solving remains, took from upstream/develop 

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-22 09:14:14 +01:00
parent ef5838bbd2
commit a314dbc562
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mod/proxy.php
View File

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