From 44e141cc6adc1ad51a6d293c117b53bea43aff87 Mon Sep 17 00:00:00 2001 From: kondou Date: Sun, 1 Sep 2013 21:57:28 +0200 Subject: [PATCH] Use \OC_Response for cache invalidation --- core/avatar/controller.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/core/avatar/controller.php b/core/avatar/controller.php index 5044f3374cd..96d80d35cc8 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -28,11 +28,8 @@ class OC_Core_Avatar_Controller { $avatar = new \OC_Avatar(); $image = $avatar->get($user, $size); - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); - header('Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT'); - header('Cache-Control: no-store, no-cache, must-revalidate'); - header('Cache-Control: post-check=0, pre-check=0', false); - header('Pragma: no-cache'); + \OC_Response::disableCaching(); + \OC_Response::setLastModifiedHeader(gmdate( 'D, d M Y H:i:s' ).' GMT'); if ($image instanceof \OC_Image) { $image->show(); } elseif ($image === false) { @@ -111,11 +108,8 @@ class OC_Core_Avatar_Controller { } $image = new \OC_Image($tmpavatar); - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); - header('Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT'); - header('Cache-Control: no-store, no-cache, must-revalidate'); - header('Cache-Control: post-check=0, pre-check=0', false); - header('Pragma: no-cache'); + \OC_Response::disableCaching(); + \OC_Response::setLastModifiedHeader(gmdate( 'D, d M Y H:i:s' ).' GMT'); $image->show(); }