summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-17 19:52:19 +0000
committerSarven Capadisli <csarven@status.net>2009-11-17 19:52:19 +0000
commit020c2b48b6a8340b7867cb575573dc4dbbe557a0 (patch)
treef03f5317d93f72ec921d00c2d90fc8083a8b34d8 /lib/router.php
parentf425f8538d8433af83ef67dd0c69fe159b421026 (diff)
parent3a980a75fc04da27da693925ee8401fc33602b8e (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index 53f30dd3e..9629267ac 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -588,6 +588,9 @@ class Router
$m->connect('api/search.json', array('action' => 'twitapisearchjson'));
$m->connect('api/trends.json', array('action' => 'twitapitrends'));
+ $m->connect('admin/site', array('action' => 'siteadminpanel'));
+ $m->connect('admin/design', array('action' => 'designadminpanel'));
+
$m->connect('getfile/:filename',
array('action' => 'getfile'),
array('filename' => '[A-Za-z0-9._-]+'));