summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-03-21 14:16:54 +0000
committerCiaranG <ciaran@ciarang.com>2009-03-21 14:16:54 +0000
commit8ba43f18cdfad31415bc9e26b2d4be9e9b4465c0 (patch)
treef4b98285ff5dcf5a98e67dae639edac4e29be254
parenta9a71297f4c915c11e573adafffeccf3ff65a31c (diff)
Changes to router setup to make notice search RSS feed work
-rw-r--r--lib/router.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php
index e39dc217a..83b3ffe60 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
@@ -421,6 +425,8 @@ class Router
function build($action, $args=null, $params=null, $fragment=null)
{
+ if($params!=null)
+ common_log(LOG_DEBUG,"build: ".$action." ".print_r($args,true)." ".print_r($params,true));
$action_arg = array('action' => $action);
if ($args) {
@@ -429,6 +435,8 @@ class Router
$args = $action_arg;
}
+ if($params!=null)
+ common_log(LOG_DEBUG,"generate args:".print_r($args,true));
return $this->m->generate($args, $params, $fragment);
}
}