Twitter integration - Add and remove Twitter accnt now working

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index b66a3f0f13f9a1c6c9b6fca52e441743505b34f6..f99215dadbdd8aec3759aa37ac53d7d67e9d9b28 100644 (file)
--- 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');