mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
include calls without parentheses
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
This commit is contained in:
parent
5c8eb5c5a7
commit
fcb7f86b76
7 changed files with 11 additions and 11 deletions
|
@ -29,7 +29,7 @@ if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
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);
|
trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
|
||||||
}
|
}
|
||||||
unset($paths, $path, $dispatcher, $root, $ds);
|
unset($paths, $path, $dispatcher, $root, $ds);
|
||||||
|
|
|
@ -89,11 +89,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
||||||
if (function_exists('ini_set')) {
|
if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
} else {
|
} 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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,11 +79,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
||||||
if (function_exists('ini_set')) {
|
if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
} else {
|
} 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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', $root . PATH_SEPARATOR . __CAKE_PATH__ . PATH_SEPARATOR . ini_get('include_path'));
|
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);
|
trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
|
||||||
}
|
}
|
||||||
unset($paths, $path, $dispatcher, $root, $ds);
|
unset($paths, $path, $dispatcher, $root, $ds);
|
||||||
|
|
|
@ -80,11 +80,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
||||||
if (function_exists('ini_set')) {
|
if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
} else {
|
} 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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,11 +70,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
||||||
if (function_exists('ini_set')) {
|
if (function_exists('ini_set')) {
|
||||||
ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
} else {
|
} 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;
|
$failed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -539,7 +539,7 @@ class View extends Object {
|
||||||
public function renderCache($filename, $timeStart) {
|
public function renderCache($filename, $timeStart) {
|
||||||
$response = $this->response;
|
$response = $this->response;
|
||||||
ob_start();
|
ob_start();
|
||||||
include ($filename);
|
include $filename;
|
||||||
|
|
||||||
$type = $response->mapType($response->type());
|
$type = $response->mapType($response->type());
|
||||||
if (Configure::read('debug') > 0 && $type === 'html') {
|
if (Configure::read('debug') > 0 && $type === 'html') {
|
||||||
|
|
Loading…
Reference in a new issue