Merge pull request #684 from topcoder-platform/develop

Version 1.9.2 - login redirect fix

Author: jmgasper

vanilla/applications/dashboard/controllers/class.entrycontroller.php

@@ -375,7 +375,11 @@ protected function checkOverride($type, $target, $transientKey = null) {
             // FIX: micro-frontends-forums-app issues-12
             $isEmbedded = (bool)  c('Garden.Embed.Allow',false);
             $remoteUrl = c("Garden.Embed.RemoteUrl");
-            if($isEmbedded && is_string( $remoteUrl)) {
+
+            // FIX Issues-681: signing from Forum
+            //$forceEmbed = $this->Request->get('Source', '') != 'forum';
+            $referer = $_SERVER['HTTP_REFERER'];
+            if($isEmbedded && is_string( $remoteUrl) && $referer != '' && strpos($referer, $remoteUrl) !== false) {
                 $targetUrl = rawurlencode($remoteUrl.'/#'.url($target));
             } else {
                 $targetUrl = rawurlencode(url($target, true));

vanilla/library/core/functions.render.php

@@ -1729,7 +1729,8 @@ function signInUrl($target = '', $force = false) {
             $target = '' ;
        }
 
-        return '/entry/signin'.($target ? '?Target='.urlencode($target) : '');
+        // FIX Issues-681: signing from Forum
+        return '/entry/signin'.($target ? '?Source=forum&Target='.urlencode($target) : '?Source=forum');
     }
 }