From 53c9922408e49a4d38ee6c87556680ebc16b8cf8 Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <karl@suma-ev.de>
Date: Thu, 4 Oct 2018 12:46:40 +0200
Subject: [PATCH] =?UTF-8?q?Resolve=20"Fehlerbehandlung=20f=C3=BCr=20nicht?=
=?UTF-8?q?=20ladbare=20Quicktips=20verbessern"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/MetaGer.php | 2 +-
app/Models/Quicktips/Quicktips.php | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/app/MetaGer.php b/app/MetaGer.php
index bc8f8a150..a5db721c4 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -92,7 +92,7 @@ class MetaGer
}
# Erstellt aus den gesammelten Ergebnissen den View
- public function createView($quicktipResults = null)
+ public function createView($quicktipResults = [])
{
# Hiermit werden die evtl. ausgewählten SuMas extrahiert, damit die Input-Boxen richtig gesetzt werden können
$focusPages = [];
diff --git a/app/Models/Quicktips/Quicktips.php b/app/Models/Quicktips/Quicktips.php
index fb395a6e6..6e5c053bc 100644
--- a/app/Models/Quicktips/Quicktips.php
+++ b/app/Models/Quicktips/Quicktips.php
@@ -65,11 +65,21 @@ class Quicktips
}
}
+ /**
+ * Load the current Quicktip results
+ * 1. Retrieve the raw results
+ * 2. Parse the results
+ * Returns an empty array if no results are found
+ */
public function loadResults()
{
$resultsRaw = $this->retrieveResults($this->hash);
- $results = $this->parseResults($resultsRaw);
- return $results;
+ if ($resultsRaw) {
+ $results = $this->parseResults($resultsRaw);
+ return $results;
+ } else {
+ return [];
+ }
}
public function retrieveResults($hash)
--
GitLab