diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
| commit | 99194e03fa50b61f99164674afc949b4bbefd44a (patch) | |
| tree | 2d38f6ec4b1e6f314d925233c781315541772a0f /actions/apitimelinefriends.php | |
| parent | 033a7570133d4183c2e162859e9b85fe7df3e40b (diff) | |
| parent | 71176b9a98ef5298162f821c621a0e467dd9570b (diff) | |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'actions/apitimelinefriends.php')
| -rw-r--r-- | actions/apitimelinefriends.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 40ce35979..c96391c12 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -346,6 +346,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), + common_user_cache_hash($this->auth_user), common_language(), $this->user->id, strtotime($this->notices[0]->created), |