summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-05-25 16:49:32 +0000
committerRobin Millette <millette@controlyourself.ca>2009-05-25 16:49:32 +0000
commit01ce677ae399874e81dc21991faf821a539fa00a (patch)
treeefac0f02a9e0cab70a97da789c07277d4041b743
parent84edf12791dc3d44625b156cda6296f1f74f8a9d (diff)
Small bugfix to installer fixing fancy URL detection.
-rw-r--r--index.php2
-rw-r--r--install.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/index.php b/index.php
index 9ff1c2c56..c2972ec5f 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,7 @@ function handleError($error)
function main()
{
// quick check for fancy URL auto-detection support in installer.
- if (isset($_SERVER['REDIRECT_URL']) && ('/check-fancy' === $_SERVER['REDIRECT_URL'])) {
+ if (isset($_SERVER['REDIRECT_URL']) && ((dirname($_SERVER['REQUEST_URI']) . '/check-fancy') === $_SERVER['REDIRECT_URL'])) {
die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
}
global $user, $action, $config;
diff --git a/install.php b/install.php
index 1d411c221..133f2b30f 100644
--- a/install.php
+++ b/install.php
@@ -117,16 +117,16 @@ function showForm()
<p class="form_guide" id='fancy-form_guide'>Enable fancy (pretty) URLs. Auto-detection failed, it depends on Javascript.</p>
</li>
<li>
- <label for="host">Hostname</label>
- <input type="text" id="host" name="host" />
- <p class="form_guide">Database hostname</p>
- </li>
- <li>
<label for="host">Site path</label>
<input type="text" id="path" name="path" value="$config_path" />
<p class="form_guide">Site path, following the "/" after the domain name in the URL. Empty is fine. Field should be filled automatically.</p>
</li>
<li>
+ <label for="host">Hostname</label>
+ <input type="text" id="host" name="host" />
+ <p class="form_guide">Database hostname</p>
+ </li>
+ <li>
<label for="host">Database</label>
<input type="text" id="database" name="database" />
<p class="form_guide">Database name</p>