diff --git a/app/Console/cake.php b/app/Console/cake.php index 9c2751028..3e24579b7 100644 --- a/app/Console/cake.php +++ b/app/Console/cake.php @@ -29,7 +29,7 @@ if (function_exists('ini_set')) { ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path')); } -if (!include ($dispatcher)) { +if (!include $dispatcher) { trigger_error('Could not locate CakePHP core files.', E_USER_ERROR); } unset($paths, $path, $dispatcher, $root, $ds); diff --git a/app/webroot/index.php b/app/webroot/index.php index 9e87e31d8..cda5040c1 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -89,11 +89,11 @@ 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')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') { $failed = true; } } diff --git a/app/webroot/test.php b/app/webroot/test.php index bccfe2272..cbd0f02a8 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -79,11 +79,11 @@ 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')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') { $failed = true; } } diff --git a/lib/Cake/Console/Templates/skel/Console/cake.php b/lib/Cake/Console/Templates/skel/Console/cake.php index dc48cb9e9..9499f8478 100644 --- a/lib/Cake/Console/Templates/skel/Console/cake.php +++ b/lib/Cake/Console/Templates/skel/Console/cake.php @@ -29,7 +29,7 @@ if (function_exists('ini_set')) { ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path')); } -if (!include ($dispatcher)) { +if (!include $dispatcher) { trigger_error('Could not locate CakePHP core files.', E_USER_ERROR); } unset($paths, $path, $dispatcher, $root, $ds); diff --git a/lib/Cake/Console/Templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php index c17e95625..c9cf292ed 100644 --- a/lib/Cake/Console/Templates/skel/webroot/index.php +++ b/lib/Cake/Console/Templates/skel/webroot/index.php @@ -80,11 +80,11 @@ 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')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . '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 70bd0afd3..3ec2f00c3 100644 --- a/lib/Cake/Console/Templates/skel/webroot/test.php +++ b/lib/Cake/Console/Templates/skel/webroot/test.php @@ -70,11 +70,11 @@ 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')) { + if (!include 'Cake' . DS . 'bootstrap.php') { $failed = true; } } else { - if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) { + if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') { $failed = true; } } diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index 78a042b69..f182e789d 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -539,7 +539,7 @@ class View extends Object { public function renderCache($filename, $timeStart) { $response = $this->response; ob_start(); - include ($filename); + include $filename; $type = $response->mapType($response->type()); if (Configure::read('debug') > 0 && $type === 'html') {