deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix error on missing files until installation is done

Browse source
This commit is contained in:
David Epely 2013-10-19 16:49:52 +02:00
commit 02fefe9985
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bootstrap.php
View file

@ -47,7 +47,9 @@ $conf['b8']['app']['namespace'] = 'PHPCI';
$conf['b8']['app']['default_controller'] = 'Home';
$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
$config = new b8\Config($conf);
$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml');
if (file_exists(dirname(__FILE__) . '/PHPCI/config.yml')) {
$config = new b8\Config($conf);
$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml');
}
require_once(dirname(__FILE__) . '/vars.php');

2
public/install.php
View file

@ -5,7 +5,7 @@ require_once(dirname(__FILE__) . '/../vars.php');
$installStage = 'start';
$formAction = '';
$config = array();
$ciUrl = ($_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://';
$ciUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://';
$ciUrl .= $_SERVER['HTTP_HOST'];
$ciUrl .= str_replace('/install.php', '', $_SERVER['REQUEST_URI']);

2
vars.php
View file

@ -7,7 +7,7 @@ if (!defined('APPLICATION_PATH')) {
}
// 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', '') . '/');
}