Merge fixes

This commit is contained in:
Dan Cryer 2014-12-18 10:45:21 +00:00
commit 5a9e71adc5
21 changed files with 618 additions and 97 deletions

View file

@ -20,12 +20,9 @@ if (empty($timezone)) {
// env for an alternative config path.
$configFile = dirname(__FILE__) . '/PHPCI/config.yml';
if (!file_exists($configFile)) {
$configEnv = getenv('phpci_config_file');
if (!empty($configEnv)) {
$configFile = $configEnv;
}
$configEnv = getenv('phpci_config_file');
if (!empty($configEnv)) {
$configFile = $configEnv;
}
// If we don't have a config file at all, fail at this point and tell the user to install: