summaryrefslogtreecommitdiff
path: root/actions/public.php
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 /actions/public.php
parent14c9366aac697e87499c5748b36fa7bf5e6cd320 (diff)
local-only is optional on public timeline
darcs-hash:20080822210307-84dde-c90f6e7953d11c5b12c7a084ac23e5578412932c.gz
Diffstat (limited to 'actions/public.php')
-rw-r--r--actions/public.php4
1 files changed, 3 insertions, 1 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');