summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-08-22 17:03:07 -0400
committerEvan Prodromou <evan@prodromou.name>2008-08-22 17:03:07 -0400
commita91cd75c17124a9c863fd60da03c54555be4a43c (patch)
treec0cc973364f2539fbc3c6f98d10961c6b2c14c36
parent14c9366aac697e87499c5748b36fa7bf5e6cd320 (diff)
local-only is optional on public timeline
darcs-hash:20080822210307-84dde-c90f6e7953d11c5b12c7a084ac23e5578412932c.gz
-rw-r--r--actions/public.php4
-rw-r--r--actions/publicrss.php4
-rw-r--r--actions/twitapistatuses.php5
-rw-r--r--lib/common.php2
4 files changed, 12 insertions, 3 deletions
diff --git a/actions/public.php b/actions/public.php
index b66a3f0f1..f99215dad 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -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');
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 185a4ff78..98a1908ab 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -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');
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 2f95d90c9..3041240dd 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -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();
diff --git a/lib/common.php b/lib/common.php
index 32ef6ea7b..6db9f91fe 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -77,6 +77,8 @@ $config =
array('blacklist' => array()),
'avatar' =>
array('server' => NULL),
+ 'public' =>
+ array('localonly' => true),
'theme' =>
array('server' => NULL),
'xmpp' =>