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

[friendica.git] / mod / proxy.php

diff --git a/mod/proxy.php b/mod/proxy.php
index 3fdb250b5ceb02362b45b4a9a0238ddfbf3d3f64..e14f08570c377ce8ed96e7f8ef7380747e132234 100644 (file)
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -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();