summaryrefslogtreecommitdiffstats
path: root/apps/contacts/photo.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-04-22 20:38:17 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-04-22 20:47:24 +0200
commit8a6cb23170b95336770bc4dcd6d58583de82815e (patch)
treec3811c2a26c9a64af5b6972d98659d5238d11b30 /apps/contacts/photo.php
parent1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff)
downloadnextcloud-server-8a6cb23170b95336770bc4dcd6d58583de82815e.tar.gz
nextcloud-server-8a6cb23170b95336770bc4dcd6d58583de82815e.zip
Contacts: Clear cache for contact photo and thumbnail when it has been changed.
Diffstat (limited to 'apps/contacts/photo.php')
-rw-r--r--apps/contacts/photo.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 298f1215e3c..117d0a9808f 100644
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -19,7 +19,12 @@ function getStandardImage(){
OC_Response::redirect(OC_Helper::imagePath('contacts', 'person_large.png'));
}
-$id = $_GET['id'];
+$id = isset($_GET['id']) ? $_GET['id'] : null;
+$caching = isset($_GET['refresh']) ? 0 : null;
+
+if(is_null($id)) {
+ getStandardImage();
+}
$contact = OC_Contacts_App::getContactVCard($id);
$image = new OC_Image();
@@ -30,7 +35,7 @@ if(!$image) {
if( is_null($contact)) {
OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR);
} else {
- OC_Response::enableCaching();
+ OC_Response::enableCaching($caching);
OC_Contacts_App::setLastModifiedHeader($contact);
// Photo :-)