Use 'StartpageAction' to determine what to show on /

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index bcdeee80c7907a769ed3acf0fcce24614090ccbc..725ecf6d06382699c8f19ebd45b62faf4b1e2be7 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -894,8 +894,7 @@ class Router
                                   'nickname' => $nickname));
 
                 $m->connect('',
-                            array('action' => 'showstream',
-                                  'nickname' => $nickname));
+                            array('action' => 'startpage'));
 
                 // peopletags
 
@@ -948,13 +947,9 @@ class Router
                                 array('tag' => self::REGEX_TAG));
                 }
             } else {
+                $m->connect('', array('action' => 'startpage'));
                 $m->connect('main/public', array('action' => 'public'));
                 $m->connect('main/all', array('action' => 'networkpublic'));
-                if (common_config('site', 'localonly')) {
-                    $m->connect('', array('action' => 'public'));
-                } else {
-                    $m->connect('', array('action' => 'networkpublic'));
-                }
                 $m->connect('rss', array('action' => 'publicrss'));
                 $m->connect('featuredrss', array('action' => 'featuredrss'));
                 $m->connect('featured/', array('action' => 'featured'));