From 7f61dc95be4ac543986c7df2459532fd8f81368d Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 25 Sep 2018 17:33:31 +0200
Subject: EventConfig: Merge event configuration from database to global config

---
 includes/view/User_view.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'includes/view/User_view.php')

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index e092855a..ddf49885 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -1,5 +1,7 @@
 <?php
 
+use Carbon\Carbon;
+
 /**
  * Renders user settings page
  *
@@ -887,10 +889,9 @@ function render_user_arrived_hint()
     global $user;
 
     if ($user['Gekommen'] == 0) {
-        $event_config = EventConfig();
-        if (!empty($event_config)
-            && !is_null($event_config['buildup_start_date'])
-            && time() > $event_config['buildup_start_date']) {
+        /** @var Carbon $buildup */
+        $buildup = config('buildup_start');
+        if (!empty($buildup) && $buildup->lessThan(new Carbon())) {
             return __('You are not marked as arrived. Please go to heaven\'s desk, get your angel badge and/or tell them that you arrived already.');
         }
     }
-- 
cgit v1.2.3-54-g00ecf