summaryrefslogtreecommitdiffstats
path: root/apps/contacts/thumbnail.php
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-23 13:03:50 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-23 13:03:50 +0200
commit1b084cc120deff1d5efd96c842c89367b283b4ce (patch)
tree319181f656e9c08d6f38b1f20dc183c90a636413 /apps/contacts/thumbnail.php
parent4c2cf35050032002d01978f53201723330ebfe16 (diff)
parent82ba2151d176e7e0e1ebcfde8de6db46f651dad4 (diff)
downloadnextcloud-server-1b084cc120deff1d5efd96c842c89367b283b4ce.tar.gz
nextcloud-server-1b084cc120deff1d5efd96c842c89367b283b4ce.zip
Merge branch 'master' into movable_apps
Diffstat (limited to 'apps/contacts/thumbnail.php')
-rw-r--r--apps/contacts/thumbnail.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index c7d37b755fe..13f16954caf 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -39,6 +39,7 @@ if(!function_exists('imagecreatefromjpeg')) {
}
$id = $_GET['id'];
+$caching = isset($_GET['refresh']) ? 0 : null;
$contact = OC_Contacts_App::getContactVCard($id);
@@ -48,7 +49,7 @@ if(is_null($contact)){
getStandardImage();
exit();
}
-OC_Response::enableCaching();
+OC_Response::enableCaching($caching);
OC_Contacts_App::setLastModifiedHeader($contact);
$thumbnail_size = 23;