Commit 35e750dd authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '450-schalter-minism-kaputt' into 'development'

Der Schalter "minism=on" löst nun wieder das Anschalten aller Subcollections aus.

Closes #450

See merge request !748
parents 1afd42a4 9dc7655f
......@@ -499,19 +499,21 @@ class MetaGer
$subcollections = [];
$tmp = [];
foreach ($enabledSearchengines as $engine) {
// Es gibt den Schalter "minism=on" Dieser soll bewirken, dass alle Minisucher angeschaltet werden.
// Wenn also "minism=on" ist, dann durchsuchen wir statt den tatsächlich angeschalteten Suchmaschinen,
// alle Suchmaschinen nach "minismCollection"
$enginesToSearchIn = $enabledSearchengines;
if ($request->input("minism", "off") === "on") {
$enginesToSearchIn = $sumas;
}
foreach ($enginesToSearchIn as $engine) {
if (isset($engine['minismCollection'])) {
$subcollections[] = $engine['minismCollection']->__toString();
} else {
$tmp[] = $engine;
}
}
$enabledSearchengines = $tmp;
if (sizeof($subcollections) > 0) {
$enabledSearchengines[] = $this->loadMiniSucher($xml, $subcollections);
}
if ($sumaCount <= 0) {
$this->errors[] = trans('metaGer.settings.noneSelected');
}
......
Markdown is supported
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