diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
| commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
| tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /actions/shownotice.php | |
| parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
| parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) | |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'actions/shownotice.php')
| -rw-r--r-- | actions/shownotice.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 9c5d83441..86df5f9f3 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -151,6 +151,7 @@ class ShownoticeAction extends OwnerDesignAction strtotime($this->avatar->modified) : 0; return 'W/"' . implode(':', array($this->arg('action'), + common_user_cache_hash(), common_language(), $this->notice->id, strtotime($this->notice->created), |