Ticket #659

inc/utils.inc.php

@@ -1537,4 +1537,12 @@ function bx_proto()
     return 0 === strncmp('https', BX_DOL_URL_ROOT, 5) ? 'https' : 'http';
 }
 
+/**
+ * Checks protocol in the link
+ */
+function bx_has_proto($sLink)
+{
+    return preg_match('@^https?://@', $sLink);    
+}
+
 /** @} */

modules/base/profile/classes/BxBaseModProfileFormsEntryHelper.php

@@ -147,6 +147,8 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
+        $oSession = BxDolSession::getInstance();
+
         $sRedirectType = getParam($CNF['PARAM_REDIRECT_AADD']);
         $sRedirectDefault = 'page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']];
 
@@ -157,8 +159,6 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
 
             // if user just joined the redirect to the page where user comes from. 
             case BX_DOL_PROFILE_REDIRECT_LAST:
-                $oSession = BxDolSession::getInstance();
-
                 $sJoinReferrer = $oSession->getValue('join-referrer');
                 if($sJoinReferrer) {
                     $sRedirectUrl = $sJoinReferrer;
@@ -179,6 +179,10 @@ class BxBaseModProfileFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
         }
 
         if($sRedirectUrl) {
+            $sRedirectUrl = BxDolPermalinks::getInstance()->permalink($sRedirectUrl);
+            if(!bx_has_proto($sRedirectUrl))
+                $sRedirectUrl = BX_DOL_URL_ROOT . $sRedirectUrl;
+
             header('Location: ' . $sRedirectUrl);
             exit;
         }