summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/shownotice.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php
index cedf09678..d32846aad 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) {