From 7b833834f93f186bc239455f6152e444c4b842c8 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 11 Oct 2017 18:21:10 +0000 Subject: [PATCH] Avoid basepath problems --- src/App.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/App.php b/src/App.php index 67dfacf7a3..30d66dd2d5 100644 --- a/src/App.php +++ b/src/App.php @@ -132,8 +132,14 @@ class App { $hostname = ''; - if (file_exists('.htpreconfig.php')) { - include '.htpreconfig.php'; + if (! static::directory_usable($basepath, false)) { + throw new Exception('Basepath ' . $basepath . ' isn\'t usable.'); + } + + $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR); + + if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) { + include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php'; } $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); @@ -201,12 +207,6 @@ class App { $this->hostname = $hostname; } - if (! static::directory_usable($basepath, false)) { - throw new Exception('Basepath ' . $basepath . ' isn\'t usable.'); - } - - $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR); - set_include_path( get_include_path() . PATH_SEPARATOR . $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR @@ -416,8 +416,8 @@ class App { $this->path = trim($parsed['path'], '\\/'); } - if (file_exists('.htpreconfig.php')) { - include '.htpreconfig.php'; + if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) { + include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php'; } if (Config::get('config', 'hostname') != '') {