From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 30 Mar 2009 19:05:50 +0000 (-0400)
Subject: Changes to router setup to make notice search RSS feed work
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=47b89aa2c3a3e07d6dc63cd5be1d558af8ece233;p=quix0rs-gnu-social.git

Changes to router setup to make notice search RSS feed work

Conflicts:

	lib/router.php
---

diff --git a/lib/router.php b/lib/router.php
index 135e07a0f0..77794aaf70 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