From 3abf806428a93c4b8dda5e4d2501cb099f5f3a63 Mon Sep 17 00:00:00 2001 From: Haydar Ciftci Date: Thu, 28 Nov 2013 14:51:08 +0100 Subject: [PATCH 1/2] Fixed an issue where the boostrap file redirects infinitely to /install.php --- bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 bootstrap.php diff --git a/bootstrap.php b/bootstrap.php old mode 100644 new mode 100755 index 17aaf608..055585ac --- a/bootstrap.php +++ b/bootstrap.php @@ -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) && $_SERVER['PHP_SELF'] != '/install.php') { header('Location: install.php'); die; } From 22fecc2d1919f4e683a9ac8808bd6bd282d9100d Mon Sep 17 00:00:00 2001 From: Haydar Ciftci Date: Wed, 4 Dec 2013 12:18:56 +0100 Subject: [PATCH 2/2] Fixed: Redirect not working when PHPCI is not installed in the server root --- bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 055585ac..250741a4 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -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) && $_SERVER['PHP_SELF'] != '/install.php') { +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; }