Skip to content
Snippets Groups Projects
Commit bcca3059 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into 'master'

Development

See merge request !1471
parents 3bff5df1 64f791ad
No related branches found
No related tags found
2 merge requests!1504Master,!1471Development
......@@ -63,6 +63,7 @@ class MetaGer
protected $adUrlsBlacklisted = [];
protected $url;
protected $fullUrl;
protected $enabledSearchengines = [];
protected $languageDetect;
protected $verificationId;
protected $verificationCount;
......@@ -1116,6 +1117,7 @@ class MetaGer
$tmp = $match[1] . $match[3];
$this->phrases[] = $match[2];
}
foreach ($this->phrases as $phrase) {
$p .= "\"$phrase\", ";
}
......@@ -1215,8 +1217,16 @@ class MetaGer
private function searchCheckStopwords($request)
{
$oldQ = $this->q;
$tmp = $this->q;
// matches '[... ]"test satz"[ ...]'
// In order to avoid "finding" stopwords inside of phrase searches only strings outside of quotation marks should be checked
while (preg_match("/(^|.*?\s)\"(.+)\"(\s.*|$)/si", $tmp, $match)) {
$tmp = $match[1] . $match[3];
}
// matches '[... ]-test[ ...]'
$words = preg_split("/\s+/si", $this->q);
$words = preg_split("/\s+/si", $tmp);
$newQ = "";
foreach ($words as $word) {
if (strpos($word, "-") === 0 && strlen($word) > 1) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment