Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #815

Merged
merged 9 commits into from
Aug 1, 2016
Merged

Develop #815

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ac86c6
Merge pull request #6 from panique/master
slaveek Dec 29, 2015
81adb24
Added public keyword to constructor.
Dec 29, 2015
d5dde95
Converted indentation to spaces in application/config files
Dec 30, 2015
8fcb01b
Converted indentation to spaces in AdminController
Dec 31, 2015
7d7c394
Converted indentation to spaces in application/core files
Dec 31, 2015
4eb85f0
Converted indentation to spaces in application/model files
Dec 31, 2015
2698846
Merge pull request #772 from slaveek/psr2-fix
panique Jan 5, 2016
7575c66
merge fix and additional comments for PR 773, generates and absolute …
Jan 5, 2016
594f016
Fix for missing code (my fault :)) in PR 773, Ticket #770: redirect a…
Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix for missing code (my fault :)) in PR 773, Ticket #770: redirect a… 
…fter failed login works now correctly
  • Loading branch information
Chris committed Jan 8, 2016
commit 594f0162d1e0fc42da199622f4ae634c79e2951d
6 changes: 5 additions & 1 deletion application/controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ public function login()
Redirect::to('user/index');
}
} else {
Redirect::to('login/index');
if (Request::post('redirect')) {
Redirect::to('login?redirect=' . ltrim(urlencode(Request::post('redirect')), '/'));
} else {
Redirect::to('login/index');
}
}
}

Expand Down