Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

This commit is contained in:
Hillel Coren 2017-10-02 21:38:02 +03:00
commit da9b1978d3

View File

@ -11,6 +11,7 @@ use Auth;
use Event; use Event;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Lang;
use Session; use Session;
use Utils; use Utils;
@ -204,7 +205,8 @@ class AuthController extends Controller
Session::flush(); Session::flush();
if ($reason = request()->reason) { $reason = htmlentities(request()->reason);
if (!empty($reason) && Lang::has("texts.{$reason}_logout")) {
Session::flash('warning', trans("texts.{$reason}_logout")); Session::flash('warning', trans("texts.{$reason}_logout"));
} }