diff options
| author | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
| commit | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (patch) | |
| tree | b2c8d2d7f569f0e3e7bfa6711cef96f806aea9f1 /mod/groups/icon.php | |
| parent | 2b2af5392f0daadc22a1db04aa17c17d4dd37c65 (diff) | |
| parent | ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d (diff) | |
| download | elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.gz elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.bz2 | |
Merge tag '1.8.11' of git://github.com/Elgg/Elgg
Elgg 1.8.11 release
Diffstat (limited to 'mod/groups/icon.php')
| -rw-r--r-- | mod/groups/icon.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/groups/icon.php b/mod/groups/icon.php index 1bd240ea6..ebdc1eb6d 100644 --- a/mod/groups/icon.php +++ b/mod/groups/icon.php @@ -18,7 +18,7 @@ if (!($group instanceof ElggGroup)) { // If is the same ETag, content didn't changed. $etag = $group->icontime . $group_guid; -if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) { +if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == "\"$etag\"") { header("HTTP/1.1 304 Not Modified"); exit; } @@ -46,9 +46,9 @@ if (!$success) { } header("Content-type: image/jpeg"); -header('Expires: ' . date('r',time() + 864000)); +header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+10 days")), true); header("Pragma: public"); header("Cache-Control: public"); header("Content-Length: " . strlen($contents)); -header("ETag: $etag"); +header("ETag: \"$etag\""); echo $contents; |