From 1d947c5d300ecd9c985d73d868d3e059841e016b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 8 Jan 2018 12:14:09 +0200
Subject: [PATCH] Handle slash at end of app url

---
 app/Models/Account.php                    | 2 +-
 app/Ninja/Presenters/AccountPresenter.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 63a8bfc65be6..a0bfc05c4137 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1421,7 +1421,7 @@ class Account extends Eloquent
      */
     public function getSiteUrl()
     {
-        $url = SITE_URL;
+        $url = trim(SITE_URL, '/');
         $iframe_url = $this->iframe_url;
 
         if ($iframe_url) {
diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php
index 9c30a5ef0c35..0b3904c1d446 100644
--- a/app/Ninja/Presenters/AccountPresenter.php
+++ b/app/Ninja/Presenters/AccountPresenter.php
@@ -247,7 +247,7 @@ class AccountPresenter extends Presenter
             $url .= $account->subdomain ?: 'app';
             $url .= '.' . Domain::getDomainFromId($account->domain_id);
         } else {
-            $url = SITE_URL;
+            $url = trim(SITE_URL, '/');
         }
 
         $url .= '/client/login';