From f7b1e7638793508f796c922e59503da70602a53c Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Mon, 24 Aug 2020 20:04:28 +0200
Subject: [PATCH] =?UTF-8?q?mots=20cl=C3=A9s=20approchants=20+=20mot=20cl?=
 =?UTF-8?q?=C3=A9=20suivi=20d'un=20caract=C3=A8re=20de=20ponctuation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/search/search.php           | 2 +-
 module/search/view/index/index.php | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/search/search.php b/module/search/search.php
index d8e3fdde..25355f9c 100755
--- a/module/search/search.php
+++ b/module/search/search.php
@@ -109,7 +109,7 @@ class search extends common {
 			$a = explode(' ',self::$motclef);
 			foreach ($a as $key => $value) {
 
-				$keywords .= self::$motentier === false ? $value . '|' : '\\b' . $value . '\\b|' ;
+				$keywords .= self::$motentier === true ? $value . '|' : '\\b' . $value . '\\b\\W|' ;
 			}
 			$keywords = substr($keywords,0,strlen($keywords) - 1);
 			$keywords .= ')/i';
diff --git a/module/search/view/index/index.php b/module/search/view/index/index.php
index b87104b6..66b72b91 100755
--- a/module/search/view/index/index.php
+++ b/module/search/view/index/index.php
@@ -16,9 +16,8 @@
             </div>
             <div class="row">
                 <div class="col12">
-                    <?php echo template::checkbox('searchMotentier', true, 'Mot entier uniquement', [
-                        'checked' => $module::$motentier,
-                        'help' => 'Pour rechercher des mots-clés consécutifs, reliez-les par le symbole +.'
+                    <?php echo template::checkbox('searchMotentier', true, 'Mots clés approchants', [
+                        'checked' => $module::$motentier
                     ]); ?>
                 </div>
             </div>