Index: class.tx_felogin_pi1.php =================================================================== --- class.tx_felogin_pi1.php (Revision 9188) +++ class.tx_felogin_pi1.php (Arbeitskopie) @@ -359,15 +359,22 @@ } } - if ($this->conf['linkPrefix'] == -1 && !$isAbsRelPrefix) { + $typolink = $this->pi_getPageLink($GLOBALS['TSFE']->id, '', array( + $this->prefixId . '[user]' => $user['uid'], + $this->prefixId . '[forgothash]' => $randHash + )); + + // link has already a protocol ? + if($typolinkHasProtocol = preg_match('%^(http)(s?)://%m', $typolink)) { + $this->conf['linkPrefix'] = null; + } + + if (($this->conf['linkPrefix'] == -1) && !$isAbsRelPrefix && !$typolinkHasProtocol) { // no preix is set, return the error return $this->pi_getLL('ll_change_password_nolinkprefix_message'); } - $link = ($isAbsRelPrefix ? '' : $this->conf['linkPrefix']) . $this->pi_getPageLink($GLOBALS['TSFE']->id, '', array( - $this->prefixId . '[user]' => $user['uid'], - $this->prefixId . '[forgothash]' => $randHash - )); + $link = $this->conf['linkPrefix'] . $typolink; $msg = sprintf($this->pi_getLL('ll_forgot_validate_reset_password', '', 0), $user['username'], $link, $validEndString);