diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-04 11:56:07 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-04 11:56:07 -0800 |
| commit | a020e230860358fc8b63cd56872bbad0446016e0 (patch) | |
| tree | ca2788c034526d53424079004ba6a726485a1e25 /classes | |
| parent | 5bdc6fa5d456c3f520d8124950684220d8f440a3 (diff) | |
| parent | 5a1cbdc6f1e32be7b8430924a1125422d8457584 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 21 | ||||
| -rw-r--r-- | classes/statusnet.ini | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 42878d94f..f9f386357 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1468,4 +1468,25 @@ class Notice extends Memcached_DataObject $handler->handle($this); } } + + function insert() + { + $result = parent::insert(); + + if ($result) { + // Profile::hasRepeated() abuses pkeyGet(), so we + // have to clear manually + if (!empty($this->repeat_of)) { + $c = self::memcache(); + if (!empty($c)) { + $ck = self::multicacheKey('Notice', + array('profile_id' => $this->profile_id, + 'repeat_of' => $this->repeat_of)); + $c->delete($ck); + } + } + } + + return $result; + } } diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 4ace4407b..a535159e8 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -586,6 +586,7 @@ modified = 384 [user_group__keys] id = N +nickname = U [user_openid] canonical = 130 |