diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2012-12-17 11:59:01 -0500 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2012-12-17 11:59:01 -0500 |
| commit | 15e5caa7849cf452c1d2383a3c35f6884ee57709 (patch) | |
| tree | 49c3efe6542d1e2089a1ae5fdd8bd031abf38803 /actions | |
| parent | b538cc3339ff886e309feb318cdea374423d1683 (diff) | |
| parent | d809ded90fb5213f1a7ec59c776f92ea654454d6 (diff) | |
| download | elgg-15e5caa7849cf452c1d2383a3c35f6884ee57709.tar.gz elgg-15e5caa7849cf452c1d2383a3c35f6884ee57709.tar.bz2 | |
Merge branch 'pr-358' into 1.8
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/login.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/login.php b/actions/login.php index ea7fb3508..1e5e92ede 100644 --- a/actions/login.php +++ b/actions/login.php @@ -7,7 +7,7 @@ */ // set forward url -if (isset($_SESSION['last_forward_from']) && $_SESSION['last_forward_from']) { +if (!empty($_SESSION['last_forward_from'])) { $forward_url = $_SESSION['last_forward_from']; unset($_SESSION['last_forward_from']); } elseif (get_input('returntoreferer')) { @@ -19,7 +19,7 @@ if (isset($_SESSION['last_forward_from']) && $_SESSION['last_forward_from']) { $username = get_input('username'); $password = get_input('password', null, false); -$persistent = get_input("persistent", false); +$persistent = (bool) get_input("persistent"); $result = false; if (empty($username) || empty($password)) { |