aboutsummaryrefslogtreecommitdiff
path: root/engine/classes
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-09 12:28:12 -0400
committerCash Costello <cash.costello@gmail.com>2011-10-09 12:28:12 -0400
commit566d0850be54c1a1c79028ac536faa31358a55fe (patch)
tree91b8db60575451a6724de225e08813db6f8fecc5 /engine/classes
parent048cc79f50fdd909a6ad38426db3991902a83048 (diff)
downloadelgg-566d0850be54c1a1c79028ac536faa31358a55fe.tar.gz
elgg-566d0850be54c1a1c79028ac536faa31358a55fe.tar.bz2
Fixes #3729 handling forwarding to page when logging into a walled garden
Diffstat (limited to 'engine/classes')
-rw-r--r--engine/classes/ElggSite.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index 44929ce21..8708800cf 100644
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@ -371,6 +371,7 @@ class ElggSite extends ElggEntity {
elgg_register_plugin_hook_handler('index', 'system', 'elgg_walled_garden_index', 1);
if (!$this->isPublicPage()) {
+ $_SESSION['last_forward_from'] = current_page_url();
register_error(elgg_echo('loggedinrequired'));
forward();
}
@@ -414,6 +415,7 @@ class ElggSite extends ElggEntity {
'action/user/requestnewpassword',
'action/user/passwordreset',
'action/security/refreshtoken',
+ 'ajax/view/js/languages',
'upgrade\.php',
'xml-rpc\.php',
'mt/mt-xmlrpc\.cgi',