adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #3474, Plugin Models Not Loading for 1.2.0.5875 pre-beta release.

Browse source 
Remove deprecated loadPluginController() from basics.php
Fixed changed loadPluginController to loadController in CacheHelper

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5905 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-10-27 03:27:09 +00:00
parent f41aa80b78
commit 7bc90a2eb1
3 changed files with 11 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
cake/basics.php
View file

@ -108,9 +108,10 @@
if (!class_exists('AppModel')) { if (!class_exists('AppModel')) {
loadModel(); loadModel();
} }
$plugin = Inflector::underscore($plugin);
$pluginAppModel = Inflector::camelize($plugin . '_app_model'); $pluginAppModel = Inflector::camelize($plugin . '_app_model');
$pluginAppModelFile = APP . 'plugins' . DS . $plugin . DS . $plugin . '_app_model.php'; $pluginAppModelFile = APP . 'plugins' . DS . $plugin . DS . $plugin . '_app_model.php';
if (!class_exists($pluginAppModel)) { if (!class_exists($pluginAppModel)) {
if (file_exists($pluginAppModelFile)) { if (file_exists($pluginAppModelFile)) {
require($pluginAppModelFile); require($pluginAppModelFile);
@ -192,9 +193,10 @@
if (strpos($name, '.') !== false) { if (strpos($name, '.') !== false) {
list($plugin, $name) = explode('.', $name); list($plugin, $name) = explode('.', $name);
$plugin = Inflector::underscore($plugin);
$pluginAppModel = Inflector::camelize($plugin . '_app_model'); $pluginAppModel = Inflector::camelize($plugin . '_app_model');
$pluginAppModelFile = APP . 'plugins' . DS . $plugin . DS . $plugin . '_app_model.php'; $pluginAppModelFile = APP . 'plugins' . DS . $plugin . DS . $plugin . '_app_model.php';
if (!class_exists($pluginAppModel)) { if (!class_exists($pluginAppModel)) {
if (file_exists($pluginAppModelFile)) { if (file_exists($pluginAppModelFile)) {
require($pluginAppModelFile); require($pluginAppModelFile);
@ -357,12 +359,7 @@
} }
if (empty($name)) { if (empty($name)) {
if (!class_exists(Inflector::camelize($plugin . 'Controller'))) { return false;
if (file_exists(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php')) {
require(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php');
return true;
}
}
} }
if (!class_exists($name . 'Controller')) { if (!class_exists($name . 'Controller')) {
@ -371,11 +368,6 @@
if (file_exists($file)) { if (file_exists($file)) {
require($file); require($file);
return true; return true;
} elseif (!class_exists(Inflector::camelize($plugin) . 'Controller')) {
if (file_exists(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php')) {
require(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php');
return true;
}
} }
return false; return false;
} }
@ -419,53 +411,6 @@
} }
return false; return false;
} }
/**
* Loads a plugin's controller.
*
* @param string $plugin Name of plugin
* @param string $controller Name of controller to load
* @return boolean Success
* @deprecated
*/
function loadPluginController($plugin, $controller) {
$pluginAppController = Inflector::camelize($plugin . '_app_controller');
$plugin = Inflector::underscore($plugin);
$pluginAppControllerFile = APP . 'plugins' . DS . $plugin . DS . $plugin . '_app_controller.php';
if (!class_exists($pluginAppController)) {
if (file_exists($pluginAppControllerFile)) {
require($pluginAppControllerFile);
} else {
return false;
}
}
if (empty($controller)) {
if (!class_exists(Inflector::camelize($plugin . 'controller'))) {
if (file_exists(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php')) {
require(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php');
return true;
}
}
}
if (!class_exists($controller . 'Controller')) {
$controller = Inflector::underscore($controller);
$file = APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $controller . '_controller.php';
if (file_exists($file)) {
require($file);
return true;
} elseif (!class_exists(Inflector::camelize($plugin) . 'Controller')) {
if (file_exists(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php')) {
require(APP . 'plugins' . DS . $plugin . DS . 'controllers' . DS . $plugin . '_controller.php');
return true;
} else {
return false;
}
}
}
return true;
}
/** /**
* Loads a helper * Loads a helper
* *

5
cake/libs/controller/controller.php
View file

@ -375,6 +375,11 @@ class Controller extends Object {
$plugin = $this->plugin . '.'; $plugin = $this->plugin . '.';
} }
if (strpos($modelClass, '.') !== false) {
list($plugin, $modelClass) = explode('.', $modelClass);
$plugin = $plugin . '.';
}
$modelKey = Inflector::underscore($modelClass); $modelKey = Inflector::underscore($modelClass);
if (!class_exists($modelClass)) { if (!class_exists($modelClass)) {

2
cake/libs/view/helpers/cache.php
View file

@ -223,7 +223,7 @@ class CacheHelper extends AppHelper {
require(\''.CAKE . 'app_controller.php\'); require(\''.CAKE . 'app_controller.php\');
} }
} }
loadPluginController(\''.$this->plugin.'\',\''.$this->controllerName.'\'); loadController(\'' . $this->plugin . '.' . $this->controllerName . '\');
loadPluginModels(\''.$this->plugin.'\'); loadPluginModels(\''.$this->plugin.'\');
'; ';
} }