summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-30 15:05:50 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-30 15:05:50 -0400
commit47b89aa2c3a3e07d6dc63cd5be1d558af8ece233 (patch)
tree8d757d03c30d7018200ff8a5909c48b409450680 /lib
parent148310e5fc78e69f6bde3683855009dc3d8d485b (diff)
Changes to router setup to make notice search RSS feed work
Conflicts: lib/router.php
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php
index 135e07a0f..77794aaf7 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -136,10 +136,14 @@ class Router
foreach (array('group', 'people', 'notice') as $s) {
$m->connect('search/'.$s, array('action' => $s.'search'));
- $m->connect('search/'.$s.'?q=:q', array('action' => $s.'search'), array('q' => '.+'));
+ $m->connect('search/'.$s.'?q=:q', array('action' => $s.'search'),array('q' => '.+'));
}
+ // The second of these is needed to make the link work correctly
+ // when inserted into the page. The first is needed to match the
+ // route on the way in. Seems to be another Net_URL_Mapper bug to me.
$m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
+ $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),array('q' => '.+'));
// notice