From 624e4076a5cfbe3a13c786a5cf170eadccf612f1 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 17 Aug 2015 14:57:12 +0930
Subject: [PATCH] Derive base URL from the original URI

---
 framework/core/src/Install/Actions/InstallAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Install/Actions/InstallAction.php b/framework/core/src/Install/Actions/InstallAction.php
index 7205c5a3e..e234fd87b 100644
--- a/framework/core/src/Install/Actions/InstallAction.php
+++ b/framework/core/src/Install/Actions/InstallAction.php
@@ -59,7 +59,7 @@ class InstallAction extends Action
             'email'    => array_get($input, 'adminEmail'),
         ]);
 
-        $baseUrl = rtrim((string) $request->getUri(), '/');
+        $baseUrl = rtrim((string) $request->getAttribute('originalUri'), '/');
 
         $data->setSetting('admin_url', $baseUrl . '/admin');
         $data->setSetting('api_url', $baseUrl . '/api');