Fixes #3729 handling forwarding to page when logging into a walled garden

diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
index 44929ce217f20fa99763fb15824855467b69e867..8708800cf475d97101e0dfbe5408bc02fb4acb92 100644 (file)
--- 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',