clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-06-11 01:29:35 +02:00
parent ecb88c93f0 892856f43c
commit 86b1b1639d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
privacy_image_cache/privacy_image_cache.php
View File

@ -30,7 +30,12 @@ function privacy_image_cache_module() {}
function privacy_image_cache_init() { function privacy_image_cache_init() {
$urlhash = 'pic:' . sha1($_REQUEST['url']); if(function_exists('header_remove')) {
header_remove('Pragma');
header_remove('pragma');
}
$urlhash = 'pic:' . sha1($_REQUEST['url']);
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash ); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash );
if (count($r)) { if (count($r)) {
$img_str = $r[0]['data']; $img_str = $r[0]['data'];
@ -90,6 +95,8 @@ function privacy_image_cache_init() {
*/ */
function privacy_image_cache_is_local_image($url) { function privacy_image_cache_is_local_image($url) {
if ($url[0] == '/') return true; if ($url[0] == '/') return true;
if (strtolower(substr($url, 0, 5)) == "data:") return true;
// links normalised - bug #431 // links normalised - bug #431
$baseurl = normalise_link(get_app()->get_baseurl()); $baseurl = normalise_link(get_app()->get_baseurl());
$url = normalise_link($url); $url = normalise_link($url);