summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/search.module4
-rw-r--r--modules/search/search.module4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/search.module b/modules/search.module
index 186908ecf..31595ec5b 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -219,7 +219,7 @@ function update_index($search_array) {
$wordlist = preg_replace("'<[\/\!]*?[^<>]*?>'si", "", $wordlist);
// Remove punctuation and stuff
- $wordlist = preg_replace("'(»|«|!|¡|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", "", $wordlist);
+ $wordlist = preg_replace("'(\xBB|\xAB|!|\xA1|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", "", $wordlist);
// Strip out (now mangled) http and tags.
$wordlist = preg_replace("'http\w+'", "", $wordlist);
@@ -361,7 +361,7 @@ function search_view($keys = NULL) {
}
function search_page() {
- $keys = $_POST["keys"];
+ $keys = isset($_GET["keys"]) ? $_GET["keys"] : $_POST["keys"];
switch (arg(1)) {
case "help":
diff --git a/modules/search/search.module b/modules/search/search.module
index 186908ecf..31595ec5b 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -219,7 +219,7 @@ function update_index($search_array) {
$wordlist = preg_replace("'<[\/\!]*?[^<>]*?>'si", "", $wordlist);
// Remove punctuation and stuff
- $wordlist = preg_replace("'(»|«|!|¡|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", "", $wordlist);
+ $wordlist = preg_replace("'(\xBB|\xAB|!|\xA1|%|,|:|;|\(|\)|\&|\"|\'|\.|-|\/|\?|\\\)'", "", $wordlist);
// Strip out (now mangled) http and tags.
$wordlist = preg_replace("'http\w+'", "", $wordlist);
@@ -361,7 +361,7 @@ function search_view($keys = NULL) {
}
function search_page() {
- $keys = $_POST["keys"];
+ $keys = isset($_GET["keys"]) ? $_GET["keys"] : $_POST["keys"];
switch (arg(1)) {
case "help":