* Added new serendipity['defaultBaseURL'] variable that makes sure

that the baseURL is not overriden when configuring serendipity with a possibly autodetected currentl URL. Patch by Manko10.
2011-09-28 12:03:28 +00:00
parent 56041459b6
commit c292badf30
5 changed files with 14 additions and 3 deletions
--- a/include/admin/configuration.inc.php
+++ b/include/admin/configuration.inc.php
@@ -30,14 +30,14 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
            $permalinkOld = array(
                $oldConfig['serendipityHTTPPath'],
                $oldConfig['serendipityPath'],
-                $oldConfig['baseURL'],
+                $oldConfig['defaultBaseURL'],
                $oldConfig['indexFile'],
                $oldConfig['rewrite']);

            $permalinkNew = array(
                $serendipity['serendipityHTTPPath'],
                $serendipity['serendipityPath'],
-                $serendipity['baseURL'],
+                $serendipity['defaultBaseURL'],
                $serendipity['indexFile'],
                $serendipity['rewrite']);