diff options
| author | Chaoyi Zha <summermontreal@gmail.com> | 2017-03-23 23:31:44 +0300 |
|---|---|---|
| committer | Chaoyi Zha <summermontreal@gmail.com> | 2017-03-23 23:31:44 +0300 |
| commit | 29d6c1c4c11ddef668a2ea1d936f55a3f0942a2a (patch) | |
| tree | b96409c3cbca766186de4ea857a2ab11a6569893 | |
| parent | 753fad41d60986336592f412f1da7bb1bf8b5e47 (diff) | |
| parent | 5916eecba04759347d0648cd90d96bc59047eed0 (diff) | |
Merge branch 'ffflorian-fix-toastr-error'
| -rw-r--r-- | resources/views/about.blade.php | 2 | ||||
| -rw-r--r-- | resources/views/layouts/base.blade.php | 12 | ||||
| -rw-r--r-- | resources/views/layouts/minimal.blade.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index d8ace52..d2ac533 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -28,7 +28,7 @@ </div> <a href='#' class='btn btn-success license-btn'>More Information</a> <pre class="license" id="gpl-license"> -Copyright (C) 2013-2016 Chaoyi Zha +Copyright (C) 2013-2017 Chaoyi Zha This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 59c9056..85d0ea2 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -1,6 +1,6 @@ <!-- Polr, a minimalist URL shortening platform. -Copyright (C) 2013-2016 Chaoyi Zha +Copyright (C) 2013-2017 Chaoyi Zha This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -60,22 +60,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <script> @if (Session::has('info')) - toastr["info"](`{{session('info')}}`, "Info") + toastr["info"](`{{ str_replace('`', '\`', session('info')) }}`, "Info") @endif @if (Session::has('error')) - toastr["error"](`{{session('error')}}`, "Error") + toastr["error"](`{{str_replace('`', '\`', session('error')) }}`, "Error") @endif @if (Session::has('warning')) - toastr["warning"](`{{session('warning')}}`, "Warning") + toastr["warning"](`{{ str_replace('`', '\`', session('warning')) }}`, "Warning") @endif @if (Session::has('success')) - toastr["success"](`{{session('success')}}`, "Success") + toastr["success"](`{{ str_replace('`', '\`', session('success')) }}`, "Success") @endif @if (count($errors) > 0) // Handle Lumen validation errors @foreach ($errors->all() as $error) - toastr["error"](`{{$error}}`, "Error") + toastr["error"](`{{ str_replace('`', '\`', $error) }}`, "Error") @endforeach @endif </script> diff --git a/resources/views/layouts/minimal.blade.php b/resources/views/layouts/minimal.blade.php index 0d6604a..55539a0 100644 --- a/resources/views/layouts/minimal.blade.php +++ b/resources/views/layouts/minimal.blade.php @@ -1,6 +1,6 @@ <!-- Polr, a minimalist URL shortening platform. -Copyright (C) 2013-2016 Chaoyi Zha +Copyright (C) 2013-2017 Chaoyi Zha This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License |