local-only is optional on public timeline

darcs-hash:20080822210307-84dde-c90f6e7953d11c5b12c7a084ac23e5578412932c.gz
This commit is contained in:
Evan Prodromou 2008-08-22 17:03:07 -04:00
parent 14c9366aac
commit a91cd75c17
4 changed files with 12 additions and 3 deletions

View File

@ -63,7 +63,9 @@ class PublicAction extends StreamAction {
# XXX: sub-optimal
$notice->is_local = 1;
if (common_config('public', 'localonly')) {
$notice->is_local = 1;
}
$notice->orderBy('created DESC, notice.id DESC');

View File

@ -38,7 +38,9 @@ class PublicrssAction extends Rss10Action {
# XXX: bad performance
$notice->is_local = 1;
if (common_config('public', 'localonly')) {
$notice->is_local = 1;
}
$notice->orderBy('created DESC, notice.id DESC');

View File

@ -61,7 +61,10 @@ class TwitapistatusesAction extends TwitterapiAction {
# XXX: sub-optimal performance
$notice->is_local = 1;
if (common_config('public', 'localonly')) {
$notice->is_local = 1;
}
$notice->orderBy('created DESC, notice.id DESC');
$notice->limit($MAX_PUBSTATUSES);
$cnt = $notice->find();

View File

@ -77,6 +77,8 @@ $config =
array('blacklist' => array()),
'avatar' =>
array('server' => NULL),
'public' =>
array('localonly' => true),
'theme' =>
array('server' => NULL),
'xmpp' =>