Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

diff --git a/lib/router.php b/lib/router.php
index 8260cb3e2e8cffa99b0290f3d346548f40a23c6a..a3be38ebbdf3804c7f1db26e549ade8a22ded8be 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -163,6 +163,9 @@ class Router
                 $m->connect('main/'.$a, array('action' => $a));
             }
 
+            $m->connect('main/public', array('action' => 'public'));
+            $m->connect('main/all', array('action' => 'networkpublic'));
+
             $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
                                                array('id' => '[0-9]+'));
 
@@ -945,7 +948,9 @@ class Router
                                 array('tag' => self::REGEX_TAG));
                 }
             } else {
+                $m->connect('main/public', array('action' => 'public'));
                 $m->connect('', array('action' => 'public'));
+                $m->connect('main/all', array('action' => 'networkpublic'));
                 $m->connect('rss', array('action' => 'publicrss'));
                 $m->connect('featuredrss', array('action' => 'featuredrss'));
                 $m->connect('featured/', array('action' => 'featured'));