mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge fix for invalid links
This commit is contained in:
parent
de7d23b3f5
commit
dc058ebb89
@ -58,8 +58,7 @@ class Authenticate
|
|||||||
|
|
||||||
if ($contact_key) {
|
if ($contact_key) {
|
||||||
$contact = $this->getContact($contact_key);
|
$contact = $this->getContact($contact_key);
|
||||||
} elseif (! empty($request->invitation_key)) {
|
} elseif ($invitation = $this->getInvitation($request->invitation_key)) {
|
||||||
$invitation = $this->getInvitation($request->invitation_key);
|
|
||||||
$contact = $invitation->contact;
|
$contact = $invitation->contact;
|
||||||
Session::put('contact_key', $contact->contact_key);
|
Session::put('contact_key', $contact->contact_key);
|
||||||
} else {
|
} else {
|
||||||
@ -108,6 +107,10 @@ class Authenticate
|
|||||||
*/
|
*/
|
||||||
protected function getInvitation($key)
|
protected function getInvitation($key)
|
||||||
{
|
{
|
||||||
|
if (! $key) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// check for extra params at end of value (from website feature)
|
// check for extra params at end of value (from website feature)
|
||||||
list($key) = explode('&', $key);
|
list($key) = explode('&', $key);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user