From c3f2d195f934c4deff91d30640ec703cb576e55d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 1 Dec 2008 23:50:21 -0500 Subject: [PATCH] generate an etag for shownotice darcs-hash:20081202045021-5ed1f-ca0f14051507602bab8898e1e99d9cdb69f2eadc.gz --- actions/shownotice.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/actions/shownotice.php b/actions/shownotice.php index cedf09678a..d32846aadc 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -42,14 +42,24 @@ class ShownoticeAction extends StreamAction { return false; } + $this->avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); + return true; } function last_modified() { - $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); return max(strtotime($this->notice->modified), strtotime($this->profile->modified), - ($avatar) ? strtotime($this->avatar->modified) : 0); + ($this->avatar) ? strtotime($this->avatar->modified) : 0); + } + + function etag() { + return 'W/"' . implode(':', array($this->arg('action'), + common_language(), + $this->notice->id, + strtotime($this->notice->modified), + strtotime($this->profile->modified), + ($this->avatar) ? strtotime($this->avatar->modified) : 0)); } function handle($args) { -- 2.39.5