From d6b3ddcd3de9fb6249514486e335d6a5179841c0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 23 May 2012 15:43:35 -0700
Subject: [PATCH] bug #431

---
 privacy_image_cache.tgz                     | Bin 0 -> 2392 bytes
 privacy_image_cache/privacy_image_cache.php |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 privacy_image_cache.tgz

diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..38a25ff7be11ede4a0b7727bc06ee74c4ddd6857
GIT binary patch
literal 2392
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
KhtiV(C;$Llillo0

literal 0
HcmV?d00001

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 88958101..4e836219 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -62,6 +62,7 @@ function privacy_image_cache_init() {
  */
 function privacy_image_cache_is_local_image($url) {
     if ($url[0] == '/') return true;
+	// links normalised - bug #431
     $baseurl = normalise_link(get_app()->get_baseurl());
 	$url = normalise_link($url);
     return (substr($url, 0, strlen($baseurl)) == $baseurl);
@@ -72,7 +73,8 @@ function privacy_image_cache_is_local_image($url) {
  * @return string
  */
 function privacy_image_cache_img_cb($matches) {
-    if (privacy_image_cache_is_local_image($matches[2])) return $matches[2];
+	// following line changed per bug #431
+    if (privacy_image_cache_is_local_image($matches[2])) return $matches[1] . $matches[2] . $matches[3];
     return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
 }