GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' into privategroup

Browse Source
This commit is contained in:
Evan Prodromou 2011-02-07 12:27:09 -05:00
commit c37f0f8256
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/Notice.php
View File

@ -446,7 +446,10 @@ class Notice extends Memcached_DataObject
function blowOnInsert($conversation = false) function blowOnInsert($conversation = false)
{ {
self::blow('profile:notice_ids:%d', $this->profile_id); self::blow('profile:notice_ids:%d', $this->profile_id);
if ($this->isPublic()) {
self::blow('public'); self::blow('public');
}
// XXX: Before we were blowing the casche only if the notice id // XXX: Before we were blowing the casche only if the notice id
// was not the root of the conversation. What to do now? // was not the root of the conversation. What to do now?
@ -481,8 +484,11 @@ class Notice extends Memcached_DataObject
$this->blowOnInsert(); $this->blowOnInsert();
self::blow('profile:notice_ids:%d;last', $this->profile_id); self::blow('profile:notice_ids:%d;last', $this->profile_id);
if ($this->isPublic()) {
self::blow('public;last'); self::blow('public;last');
} }
}
/** save all urls in the notice to the db /** save all urls in the notice to the db
* *
@ -2107,4 +2113,14 @@ class Notice extends Memcached_DataObject
$obj->whereAdd($max); $obj->whereAdd($max);
} }
} }
function isPublic()
{
if (common_config('public', 'localonly')) {
return ($this->is_local == Notice::LOCAL_PUBLIC);
} else {
return (($this->is_local != Notice::LOCAL_NONPUBLIC) &&
($this->is_local != Notice::GATEWAY));
}
}
} }