diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-23 14:24:00 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-23 14:24:00 +0200 |
| commit | 7242806c309afdc38a0b5fa165a2a00f87292c9d (patch) | |
| tree | e112184b03d01c5bcd2382d91f88505f48dd9f6d /app/install.php | |
| parent | d2caf4349c4c5957ddc453795ffe8ea10237231c (diff) | |
| parent | f4472fc918c1fa1d1cfb2adae6c38a9a261e8c9b (diff) | |
Merge pull request #917 from marienfressinaud/865-base_url-pubsubhubbub
Generate base_url during installation
Diffstat (limited to 'app/install.php')
| -rw-r--r-- | app/install.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/install.php b/app/install.php index d5455f17d..5a774d7c1 100644 --- a/app/install.php +++ b/app/install.php @@ -212,8 +212,11 @@ function saveStep3() { $_SESSION['bd_prefix_user'] = $_SESSION['bd_prefix'] . (empty($_SESSION['default_user']) ? '' : ($_SESSION['default_user'] . '_')); } + // We use dirname to remove the /i part + $base_url = dirname(Minz_Request::guessBaseUrl()); $config_array = array( 'salt' => $_SESSION['salt'], + 'base_url' => $base_url, 'title' => $_SESSION['title'], 'default_user' => $_SESSION['default_user'], 'auth_type' => $_SESSION['auth_type'], @@ -226,6 +229,7 @@ function saveStep3() { 'prefix' => $_SESSION['bd_prefix'], 'pdo_options' => array(), ), + 'pubsubhubbub_enabled' => server_is_public($base_url), ); @unlink(join_path(DATA_PATH, 'config.php')); //To avoid access-rights problems |