diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-10-06 16:58:22 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-10-06 16:58:22 -0700 |
| commit | 26b56fb5d6d71bb56f03d0d4e999e09a1fc81476 (patch) | |
| tree | 667e08543ddbfed585a1d99c8b115c0cd5c7557c /engine/lib/sessions.php | |
| parent | 4706f47ca0b19d9baa45742ae7c8d270c42e9490 (diff) | |
| parent | 57c409526195ebbd46b239f4af06ef199d001df9 (diff) | |
| download | elgg-26b56fb5d6d71bb56f03d0d4e999e09a1fc81476.tar.gz elgg-26b56fb5d6d71bb56f03d0d4e999e09a1fc81476.tar.bz2 | |
Merge pull request #69 from mrclay/issue3765
Fixes #3765 forward throws Exception if headers sent.
Diffstat (limited to 'engine/lib/sessions.php')
| -rw-r--r-- | engine/lib/sessions.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php index 407bb69c5..ae42956a9 100644 --- a/engine/lib/sessions.php +++ b/engine/lib/sessions.php @@ -472,10 +472,7 @@ function gatekeeper() { if (!elgg_is_logged_in()) { $_SESSION['last_forward_from'] = current_page_url(); register_error(elgg_echo('loggedinrequired')); - - if (!forward('', 'login')) { - throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper')); - } + forward('', 'login'); } } @@ -490,9 +487,7 @@ function admin_gatekeeper() { if (!elgg_is_admin_logged_in()) { $_SESSION['last_forward_from'] = current_page_url(); register_error(elgg_echo('adminrequired')); - if (!forward('', 'admin')) { - throw new SecurityException(elgg_echo('SecurityException:UnexpectedOutputInGatekeeper')); - } + forward('', 'admin'); } } |