diff --git a/app/webroot/index.php b/app/webroot/index.php index 31901c223..b5b1d6392 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -53,6 +53,8 @@ * * For ease of development CakePHP uses PHP's include_path. If you * cannot modify your include_path set this value. + * + * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php */ //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib'); diff --git a/app/webroot/test.php b/app/webroot/test.php index f48bfb593..b6caa107f 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -50,6 +50,8 @@ ini_set('display_errors', 1); * * For ease of development CakePHP uses PHP's include_path. If you * need to cannot modify your include_path, you can set this path. + * + * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php */ //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib'); diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php index 824565bcc..ab9465402 100644 --- a/lib/Cake/Console/Templates/skel/webroot/index.php +++ b/lib/Cake/Console/Templates/skel/webroot/index.php @@ -53,6 +53,8 @@ * * For ease of development CakePHP uses PHP's include_path. If you * need to squeeze a bit more performance you can set this path. + * + * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php */ //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__); @@ -69,9 +71,6 @@ } if (!defined('CAKE_CORE_INCLUDE_PATH')) { - if (function_exists('ini_set')) { - ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path')); - } if (!include('Cake' . DS . 'bootstrap.php')) { $failed = true; } diff --git a/lib/Cake/Console/Templates/skel/webroot/test.php b/lib/Cake/Console/Templates/skel/webroot/test.php index 9f83f4315..4931b069f 100644 --- a/lib/Cake/Console/Templates/skel/webroot/test.php +++ b/lib/Cake/Console/Templates/skel/webroot/test.php @@ -50,6 +50,8 @@ ini_set('display_errors', 1); * * For ease of development CakePHP uses PHP's include_path. If you * need to cannot modify your include_path, you can set this path. + * + * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php */ //define('CAKE_CORE_INCLUDE_PATH', __CAKE_PATH__); @@ -66,9 +68,6 @@ if (!defined('WWW_ROOT')) { } if (!defined('CAKE_CORE_INCLUDE_PATH')) { - if (function_exists('ini_set')) { - ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path')); - } if (!include('Cake' . DS . 'bootstrap.php')) { $failed = true; }