Browse Source

Adding comments about CAKE_CORE_INCLUDE_PATH.
Removing ini_set() blocks that don't need to exist.

Mark Story 14 years ago
parent
commit
b45e8eb0cd

+ 2 - 0
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');
 

+ 2 - 0
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');
 

+ 2 - 3
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;
 		}

+ 2 - 3
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;
 	}