From 10cc204c230804eea7d44c4e684a5d50ebf7bb4f Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 4 Oct 2016 14:40:43 +0200
Subject: [PATCH] Revert "Merge branch
'272-zu-viele-bilderergebnisse-auf-einer-seite' into 'development'"
This reverts merge request !450
---
app/MetaGer.php | 2 --
config/settings.php | 5 -----
resources/views/metager3bilder.blade.php | 6 +++---
3 files changed, 3 insertions(+), 10 deletions(-)
delete mode 100644 config/settings.php
diff --git a/app/MetaGer.php b/app/MetaGer.php
index fc5d0c2a6..c29d45c81 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -100,8 +100,6 @@ class MetaGer
$this->createLogs();
if ($this->fokus === "bilder") {
- # Bei der Bildersuche wird die Anzahl der Ergebnisse pro Seite begrenzt
- $viewResults = array_slice($viewResults, 0, config('settings.maxPictureResults', 30), true);
switch ($this->out) {
case 'results':
return view('metager3bilderresults')
diff --git a/config/settings.php b/config/settings.php
deleted file mode 100644
index 7d9f28ce8..000000000
--- a/config/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
- 'maxPictureResults' => 30,
-];
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index a90c8afba..d37b4d7f5 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -20,11 +20,11 @@
</div>
@endif
<div id="container">
- @foreach($results as $result)
+ @foreach($metager->getResults() as $result)
<div class="item">
<div class="img">
- <a href="{{ $result['link'] }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result['image']) }}" width="150px" alt=""/></a>
- <span class="label label-default hostlabel">{!! $result['gefVon'] !!}</span>
+ <a href="{{ $result->link }}" target="{{ $metager->getTab() }}"><img src="{{ $metager->getImageProxyLink($result->image) }}" width="150px" alt=""/></a>
+ <span class="label label-default hostlabel">{!! $result->gefVon !!}</span>
</div>
</div>
@endforeach
--
GitLab