Commit 61a198bd authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '328-suche-sturzt-ab-bei-suche-nach-wort' into 'development'

Die Suche funktioniert jetzt auch wenn man nur stopworte und blacklists eingibt,…

… gibt aber natürlich eine fehlermeldung für ein fehlendes suchwort aus

Closes #328

See merge request !518
parents 6ed62d94 8f40371a
...@@ -421,7 +421,7 @@ class MetaGer ...@@ -421,7 +421,7 @@ class MetaGer
public function createSearchEngines(Request $request) public function createSearchEngines(Request $request)
{ {
# Wenn es kein Suchwort gibt # Wenn es kein Suchwort gibt
if (!$request->has("eingabe")) { if (!$request->has("eingabe") || $this->q === "") {
return; return;
} }
...@@ -925,11 +925,16 @@ class MetaGer ...@@ -925,11 +925,16 @@ class MetaGer
} else { } else {
$site = ""; $site = "";
} }
$this->searchCheckSitesearch($site); $this->searchCheckSitesearch($site);
$this->searchCheckHostBlacklist(); $this->searchCheckHostBlacklist();
$this->searchCheckDomainBlacklist(); $this->searchCheckDomainBlacklist();
$this->searchCheckPhrase(); $this->searchCheckPhrase();
$this->searchCheckStopwords(); $this->searchCheckStopwords();
if ($this->q === "") {
$this->warnings[] = trans('metaGer.formdata.noSearch');
}
} }
public function searchCheckSitesearch($site) public function searchCheckSitesearch($site)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment