diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-08 15:48:52 -0800 |
| commit | b2e8d8407cc7f1abb5e8767cd3403ac356775eaa (patch) | |
| tree | 5cfaed5f1f21a697e147b41695c7e8c5282324a3 /classes | |
| parent | 3833dc8c1f3f9ba5e3b12bf2715e4a4fb3adabf1 (diff) | |
| parent | 4e6f587f868d71f08c618d0dedf6ddf0331619c2 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Memcached_DataObject.php | 2 | ||||
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | classes/Profile.php | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index ab65c30ce..dfd06b57e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -363,7 +363,7 @@ class Memcached_DataObject extends DB_DataObject $cached[] = clone($inst); } $inst->free(); - $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry); + $c->set($ckey, $cached, Cache::COMPRESSED, $expiry); return new ArrayWrapper($cached); } diff --git a/classes/Notice.php b/classes/Notice.php index f9f386357..fca1c599c 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1176,6 +1176,10 @@ class Notice extends Memcached_DataObject // Figure out who that is. $sender = Profile::staticGet('id', $profile_id); + if (empty($sender)) { + return null; + } + $recipient = common_relative_profile($sender, $nickname, common_sql_now()); if (empty($recipient)) { diff --git a/classes/Profile.php b/classes/Profile.php index 1076fb2cb..feabc2508 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -716,6 +716,7 @@ class Profile extends Memcached_DataObject switch ($right) { case Right::DELETEOTHERSNOTICE: + case Right::MAKEGROUPADMIN: case Right::SANDBOXUSER: case Right::SILENCEUSER: case Right::DELETEUSER: |