diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-09 21:51:24 -0700 |
commit | 4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7 (patch) | |
tree | 91535b33cd2b62b0726821e4d217d587da7cd61b /lib/router.php | |
parent | b3628b78448266fda2368f1317e70d1cca45ac17 (diff) | |
parent | ed627bb4bd6424325478412055d295b185f9f662 (diff) |
Merge branch '0.8.x' into userdesign
Conflicts:
actions/designsettings.php
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php index fc119821b..456d1793e 100644 --- a/lib/router.php +++ b/lib/router.php @@ -164,6 +164,10 @@ class Router array('action' => 'newnotice'), array('replyto' => '[A-Za-z0-9_-]+')); + $m->connect('notice/:notice/file', + array('action' => 'file'), + array('notice' => '[0-9]+')); + $m->connect('notice/:notice', array('action' => 'shownotice'), array('notice' => '[0-9]+')); |