Merge remote-tracking branch 'memoryleak/master' into block8-master-23

This commit is contained in:
meadsteve 2013-12-23 14:51:03 +00:00
commit f09ed3edad

2
bootstrap.php Normal file → Executable file
View file

@ -27,7 +27,7 @@ $autoload = function ($class) {
spl_autoload_register($autoload, true, true);
if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) {
if (!file_exists(dirname(__FILE__) . '/PHPCI/config.yml') && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE) && substr($_SERVER['PHP_SELF'], -12) != '/install.php') {
header('Location: install.php');
die;
}