fix error on missing files until installation is done
This commit is contained in:
parent
ed5611c573
commit
02fefe9985
|
@ -47,7 +47,9 @@ $conf['b8']['app']['namespace'] = 'PHPCI';
|
||||||
$conf['b8']['app']['default_controller'] = 'Home';
|
$conf['b8']['app']['default_controller'] = 'Home';
|
||||||
$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
|
$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
|
||||||
|
|
||||||
$config = new b8\Config($conf);
|
if (file_exists(dirname(__FILE__) . '/PHPCI/config.yml')) {
|
||||||
$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml');
|
$config = new b8\Config($conf);
|
||||||
|
$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml');
|
||||||
|
}
|
||||||
|
|
||||||
require_once(dirname(__FILE__) . '/vars.php');
|
require_once(dirname(__FILE__) . '/vars.php');
|
||||||
|
|
|
@ -5,7 +5,7 @@ require_once(dirname(__FILE__) . '/../vars.php');
|
||||||
$installStage = 'start';
|
$installStage = 'start';
|
||||||
$formAction = '';
|
$formAction = '';
|
||||||
$config = array();
|
$config = array();
|
||||||
$ciUrl = ($_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://';
|
$ciUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://';
|
||||||
$ciUrl .= $_SERVER['HTTP_HOST'];
|
$ciUrl .= $_SERVER['HTTP_HOST'];
|
||||||
$ciUrl .= str_replace('/install.php', '', $_SERVER['REQUEST_URI']);
|
$ciUrl .= str_replace('/install.php', '', $_SERVER['REQUEST_URI']);
|
||||||
|
|
||||||
|
|
2
vars.php
2
vars.php
|
@ -7,7 +7,7 @@ if (!defined('APPLICATION_PATH')) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define our PHPCI_URL, if not already defined:
|
// Define our PHPCI_URL, if not already defined:
|
||||||
if (!defined('PHPCI_URL')) {
|
if (!defined('PHPCI_URL') && isset($config)) {
|
||||||
define('PHPCI_URL', $config->get('phpci.url', '') . '/');
|
define('PHPCI_URL', $config->get('phpci.url', '') . '/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue