From 0a20883aa862779b48fd2a297456c2db04cffb95 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Thu, 31 Aug 2017 12:25:06 +0200
Subject: Reimplementation of 2840bb619 (signup requires arrival), closes #330

---
 includes/helper/message_helper.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'includes/helper')

diff --git a/includes/helper/message_helper.php b/includes/helper/message_helper.php
index 7a42a7b7..4fa0efe3 100644
--- a/includes/helper/message_helper.php
+++ b/includes/helper/message_helper.php
@@ -57,16 +57,17 @@ function success($msg, $immediately = false)
  * @param string $class
  * @param string $msg
  * @param bool   $immediately
- * @return string|null
+ * @return string
  */
 function alert($class, $msg, $immediately = false)
 {
     $session = session();
 
+    if (empty($msg)) {
+        return '';
+    }
+
     if ($immediately) {
-        if ($msg == '') {
-            return '';
-        }
         return '<div class="alert alert-' . $class . '">' . $msg . '</div>';
     }
 
@@ -74,5 +75,5 @@ function alert($class, $msg, $immediately = false)
     $message .= alert($class, $msg, true);
     $session->set('msg', $message);
 
-    return null;
+    return '';
 }
-- 
cgit v1.2.3-54-g00ecf