Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:44:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-09-29 17:16:19 +03:00
parent bf85aa7ddd
commit c38577e0a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -113,7 +113,7 @@ class AccountController extends BaseController
event(new UserSignedUp()); event(new UserSignedUp());
event(new UserLoggedIn()); event(new UserLoggedIn());
$redirectTo = Input::get('redirect_to', 'invoices/create'); $redirectTo = Input::get('redirect_to') ?: 'invoices/create';
return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up')); return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up'));
} }

2
app/Models/Invitation.php
View File

@ -40,7 +40,7 @@ class Invitation extends EntityModel
if ($iframe_url) { if ($iframe_url) {
return "{$iframe_url}/?{$this->invitation_key}"; return "{$iframe_url}/?{$this->invitation_key}";
} else if ($this->account->subdomain) { } else if ($this->account->subdomain) {
$url = Utils::replaceSubdomain($url, $this->subdomain); $url = Utils::replaceSubdomain($url, $this->account->subdomain);
} }
return "{$url}/view/{$this->invitation_key}"; return "{$url}/view/{$this->invitation_key}";