- bug 101 fixed: correction reported from branch 1.4

git-svn-id: http://piwigo.org/svn/trunk@867 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 2 insertions, 2 deletions

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.= '&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);