From 1c247bc4073451ad156ecedfbd2f7ebe73b56c12 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 18 Aug 2015 22:01:18 +0200
Subject: Fix redirect URI when using multiple tabs

If we store only the last called URI in the session we can't support
multiple browser tabs that all need to log in again. Fix this by
storing the URI in the URL.

Also change a trim() to ltrim() so that the URI string we store keeps
it's trailing slash.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/user/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/views/user/login.php')

diff --git a/application/views/user/login.php b/application/views/user/login.php
index 3e30d53bd..5b2067bb0 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -3,7 +3,7 @@ if (isset($login_error)) { ?>
 	<div class="alert alert-danger">The entered credentials are invalid.</div>
 <?php } ?>
 
-<?php echo form_open('user/login', array("class" => "form-horizontal login-page")); ?>
+<?php echo form_open("user/login?redirect_uri=$redirect_uri", array("class" => "form-horizontal login-page")); ?>
 	<div class="form-group">
 		<label class="control-label" for="inputUsername">Username</label>
 		<div class="controls">
-- 
cgit v1.2.3-24-g4f1b