From 2e8a34adc77cad3c4a8592057a2dd88e6f090e36 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Sun, 18 Sep 2005 21:09:44 +0000
Subject: - bug 101 fixed: correction reported from branch 1.4

git-svn-id: http://piwigo.org/svn/trunk@867 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 doc/ChangeLog                      | 4 ++++
 include/category_calendar.inc.php  | 2 +-
 include/functions_category.inc.php | 2 +-
 search.php                         | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0a5aa9c64..de2210587 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18 Pierrick LE GALL
+
+	* bug 101 fixed: correction reported from branch 1.4
+
 2005-09-17 Pierrick LE GALL
 
 	* new: automatic new password sent by mail when requested by user
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index 827897b85..2ef31d7e0 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -424,7 +424,7 @@ SELECT file,tn_ext,'.$conf['calendar_datefield'].',path
     $url_link.= '&amp;search='.$conf['calendar_datefield'].':'.$_GET['day'];
     if ($calendar_category != 0)
     {
-      $url_link.= ';cat:'.$calendar_category.'|AND';
+      $url_link.= '--cat:'.$calendar_category.'|AND';
     }
     
     $template->assign_block_vars(
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 005452db1..0dfb2a7a3 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -393,7 +393,7 @@ function initialize_category( $calling_page = 'category' )
           $search['mode'] = 'OR';
         }
 
-        $search_tokens = explode('+', $tokens[0]);
+        $search_tokens = explode('--', $tokens[0]);
         foreach ($search_tokens as $search_token)
         {
           $tokens = explode(':', $search_token);
diff --git a/search.php b/search.php
index d65bf2434..2778c8b80 100644
--- a/search.php
+++ b/search.php
@@ -114,7 +114,7 @@ if (isset($_POST['submit']))
       }
       array_push($tokens, $token);
     }
-    $search_string.= implode('+', $tokens);
+    $search_string.= implode('--', $tokens);
     if (count($tokens) > 1)
     {
       $search_string.= '|AND';
-- 
cgit v1.2.3