AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some pathing information, for cases where the KB source

Browse Source 
tree is not in or under the webroot.
This commit is contained in:
Dj Padzensky
2016-04-13 19:03:10 -07:00
parent ab02a9a162
commit f4e8eb176f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/check_setup.php
View File

@@ -15,8 +15,8 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) {
} }
// Check data folder if sqlite // Check data folder if sqlite
if (DB_DRIVER === 'sqlite' && ! is_writable('data')) { if (DB_DRIVER === 'sqlite' && ! is_writable(dirname(DB_FILENAME))) {
throw new Exception('The directory "data" must be writeable by your web server user'); throw new Exception('The directory "'.dirname(DB_FILENAME).'" must be writeable by your web server user');
} }
// Check PDO extensions // Check PDO extensions

8
app/common.php
View File

@@ -14,12 +14,12 @@ if (getenv('DATABASE_URL')) {
define('DB_NAME', ltrim($dbopts["path"], '/')); define('DB_NAME', ltrim($dbopts["path"], '/'));
} }
if (file_exists('config.php')) { if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'config.php')) {
require 'config.php'; require __DIR__.DIRECTORY_SEPARATOR.'config.php';
} }
if (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) { if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'config.php')) {
require 'data'.DIRECTORY_SEPARATOR.'config.php'; require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'data'.DIRECTORY_SEPARATOR.'config.php';
} }
require __DIR__.'/constants.php'; require __DIR__.'/constants.php';