From 77eb349f45d91d721c6322d4205161c3c0d62f4c Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Mon, 13 Nov 2017 10:13:50 +0100
Subject: [PATCH] =?UTF-8?q?Fixed:=20Settings=20abbrechen=20leitet=20jetzt?=
 =?UTF-8?q?=20auf=20zuletzt=20benutzte=20Seite=20zur=C3=BCck=20(statt=20au?=
 =?UTF-8?q?f=20Startseite)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/parts/searchbar.blade.php | 2 +-
 resources/views/settings.blade.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/parts/searchbar.blade.php b/resources/views/parts/searchbar.blade.php
index bd3da70a4..9e19e769c 100644
--- a/resources/views/parts/searchbar.blade.php
+++ b/resources/views/parts/searchbar.blade.php
@@ -21,7 +21,7 @@
 				</button>
 			</div>
 			<div class="search-settings">
-				<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
+				<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
 					<i class="fa fa-cog" aria-hidden="true"></i>
 				</a>
 			</div>
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 5b7b976ab..02b79c3e8 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -56,7 +56,7 @@
 				<input type="text" class="form-control settings-form-control" name="param_key" placeholder="@lang('settings.key.placeholder')">
 			</div>
 		<div id="settings-buttons">
-			<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">@lang('settings.abort') <i class="fa fa-times" aria-hidden="true"></i></a>
+			<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ URL::previous() }}">@lang('settings.abort') <i class="fa fa-times" aria-hidden="true"></i></a>
 			<input id="unten" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.1') !!}">
 			<input id="save" class="btn btn-primary hidden" type="button" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
 			<input id="plugin" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.3') !!}">
-- 
GitLab