From 65b0109d39d876ee5bd9801cc44f55ad1712bb40 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Wed, 28 Sep 2016 13:03:33 +0800
Subject: [PATCH] fix showing flash message

---
 app/helpers.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index ddfa98e1..a7720211 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -102,11 +102,9 @@ if (! function_exists('bs_footer')) {
             echo "<script type=\"text/javascript\" src=\"$script\"></script>";
         }
 
-        if (Session::has('msg')): ?>
-        <script>
-            toastr.info('{{ Session::pull('msg') }}');
-        </script>
-        <?php endif;
+        if (Session::has('msg')) {
+            echo "<script>toastr.info('".Session::pull('msg')."');</script>";
+        }
 
         echo '<script>'.Option::get("custom_js").'</script>';
     }
@@ -188,7 +186,7 @@ if (! function_exists('menv')) {
      */
     function menv($key, $default = null)
     {
-        if (function_exists('getenv')) {
+        if (function_exists('putenv') && function_exists('getenv')) {
             // try to read by getenv()
             $value = getenv($key);