adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace complicated $$foo with simple variable.

Browse source
This commit is contained in:
mark_story 2011-11-12 21:00:03 -05:00
parent 42f9f8e2c3
commit 2c7854cc2f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Cake/Utility/ClassRegistry.php
View file

@ -133,12 +133,12 @@ class ClassRegistry {
App::uses($class, $pluginPath . 'Model');
if (class_exists($class)) {
${$class} = new $class($settings);
$instance = new $class($settings);
if ($strict) {
${$class} = (${$class} instanceof Model) ? ${$class} : null;
$instance = ($instance instanceof Model) ? $instance : null;
}
}
if (!isset(${$class})) {
if (!isset($instance)) {
if ($strict) {
return false;
} elseif ($plugin && class_exists($plugin . 'AppModel')) {
@ -148,10 +148,10 @@ class ClassRegistry {
}
if (!empty($appModel)) {
$settings['name'] = $class;
${$class} = new $appModel($settings);
$instance = new $appModel($settings);
}
if (!isset(${$class})) {
if (!isset($instance)) {
trigger_error(__d('cake_dev', '(ClassRegistry::init() could not create instance of %1$s class %2$s ', $class, $type), E_USER_WARNING);
return $false;
}
@ -166,7 +166,7 @@ class ClassRegistry {
if ($count > 1) {
return $true;
}
return ${$class};
return $instance;
}
/**