Small bugfix to installer fixing fancy URL detection.

diff --git a/index.php b/index.php
index 9ff1c2c56aac54cd385f416ba07953497cf5f8b8..c2972ec5fe0b7c5da12277bf40a78340e8d59702 100644 (file)
--- 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 1d411c22187bacb8649e01c5ed3313a4c1d82c05..133f2b30f68843220461fb7fcefd52c01cf738f9 100644 (file)
--- a/install.php
+++ b/install.php
@@ -116,16 +116,16 @@ function showForm()
                 <input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br />
                 <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" />