aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-05-02 20:59:47 +0000
committerplegall <plg@piwigo.org>2005-05-02 20:59:47 +0000
commit93277f9fbbdf7818da9a06779dcc5d1568a8e4a3 (patch)
treebc920c68468ee70981fc8901b2cab2f9efd08ea4
parent39e65897dccd7a459ff2eda5c221ed0f48b7d3c9 (diff)
- bug 101 fixed : "problem with IE search on keywords". Separator character
";" is not officially a supported character for URL. Replaced by "--". git-svn-id: http://piwigo.org/svn/branches/branch-1_4@785 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/category_calendar.inc.php2
-rw-r--r--include/functions_category.inc.php2
-rw-r--r--search.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index fd6c11861..2f57edaab 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -406,7 +406,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 9c4e1ebab..9d946df4f 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -389,7 +389,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 0a39bc9ca..3126b8462 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';