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

Merge branch 'development' into 'master'

Development



See merge request !273
parents 4bb08965 2055cd2a
No related branches found
No related tags found
2 merge requests!285Resolve "Datenschutzerklärung erweitern und Code Formattierungen",!273Development
......@@ -12,7 +12,7 @@ use App\lib\TextLanguageDetect\TextLanguageDetect;
use App\lib\TextLanguageDetect\LanguageDetect\TextLanguageDetectException;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
#use \Illuminate\Pagination\Paginator;
use LaravelLocalization;
class MetaGer
{
......@@ -270,6 +270,11 @@ class MetaGer
$this->results = $paginatedSearchResults;
if( LaravelLocalization::getCurrentLocale() === "en" )
{
$this->ads = [];
}
$this->validated = false;
if( isset($this->password) )
{
......
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