From 5c4b28bbf29cdbd5e3d19a511b9329595ba721b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Tue, 17 Aug 2010 00:12:09 +0200
Subject: [PATCH] Update SearchSet args() function, and core for same
 functions.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 core                           |  2 +-
 include/userset.inc.php        | 12 ++++++++++++
 templates/search/adv.links.tpl |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core b/core
index 786bffb..e8e034f 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 786bffb570bfc2f5ff1dad386a9558501d4c16e8
+Subproject commit e8e034fd9237000dba475f8ed890bc52115963d5
diff --git a/include/userset.inc.php b/include/userset.inc.php
index e4631a2..0612d2f 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -126,6 +126,18 @@ class SearchSet extends ProfileSet
         parent::__construct($conds, $orders);
     }
 
+    /** Add a "rechercher=Chercher" field to the query to simulate the POST
+     * behaviour.
+     */
+    public function args()
+    {
+        $args = parent::args();
+        if (!isset($args['rechercher'])) {
+            $args['rechercher'] = 'Chercher';
+        }
+        return $args;
+    }
+
     protected function &getFilterResults(PlFilter &$pf, PlLimit $limit)
     {
         $profiles = $pf->getProfiles($limit, Profile::FETCH_MINIFICHES);
diff --git a/templates/search/adv.links.tpl b/templates/search/adv.links.tpl
index 58afd76..381d450 100644
--- a/templates/search/adv.links.tpl
+++ b/templates/search/adv.links.tpl
@@ -25,12 +25,12 @@
 <ul class="noprint">
   {if $with_soundex && ($smarty.request.firstname || $smarty.request.name)}
   <li>Étendre ta recherche par <strong>
-    <a  href="search/adv{$plset_search}with_soundex=1">proximité sonore</a>
+    <a  href="search/adv{$plset_args}with_soundex=1">proximité sonore</a>
   </strong>
   </li>
   {/if}
 
-  <li><strong><a href="search/adv{$plset_search|regex_replace:"/rechercher=[^&]*/":""}">Modifier</a>
+  <li><strong><a href="search/adv{$plset_args|regex_replace:"/rechercher=[^&]*/":""}">Modifier</a>
   </strong> ta recherche
   </li>
 
-- 
2.1.4