From 566d0850be54c1a1c79028ac536faa31358a55fe Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 9 Oct 2011 12:28:12 -0400
Subject: Fixes #3729 handling forwarding to page when logging into a walled
 garden

---
 engine/classes/ElggSite.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engine/classes/ElggSite.php')

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',
-- 
cgit v1.2.3