mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
Removing extra directory separators in uses() paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3953 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
c308326555
commit
11d5b0fa7b
5 changed files with 6 additions and 6 deletions
|
@ -112,12 +112,12 @@ if (!defined('PHP5')) {
|
|||
$filename = CACHE . 'views' . DS . convertSlash($uri) . '.php';
|
||||
|
||||
if (file_exists($filename)) {
|
||||
uses(DS . 'controller' . DS . 'component', DS . 'view' . DS . 'view');
|
||||
uses('controller' . DS . 'component', DS . 'view' . DS . 'view');
|
||||
$v = null;
|
||||
$view = new View($v);
|
||||
$view->renderCache($filename, $TIME_START);
|
||||
} elseif(file_exists(CACHE . 'views' . DS . convertSlash($uri) . '_index.php')) {
|
||||
uses(DS . 'controller' . DS . 'component', DS . 'view' . DS . 'view');
|
||||
uses('controller' . DS . 'component', DS . 'view' . DS . 'view');
|
||||
$v = null;
|
||||
$view = new View($v);
|
||||
$view->renderCache(CACHE . 'views' . DS . convertSlash($uri) . '_index.php', $TIME_START);
|
||||
|
|
|
@ -317,7 +317,7 @@ class Dispatcher extends Object {
|
|||
$classVars = get_object_vars($controller);
|
||||
|
||||
if ($missingAction && in_array('scaffold', array_keys($classVars))) {
|
||||
uses(DS.'controller'.DS.'scaffold');
|
||||
uses('controller'. DS . 'scaffold');
|
||||
return new Scaffold($controller, $params);
|
||||
} else {
|
||||
$output = call_user_func_array(array(&$controller, $params['action']), empty($params['pass'])? null: $params['pass']);
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
*
|
||||
*/
|
||||
if (!class_exists('Model')) {
|
||||
uses(DS . 'model' . DS . 'model');
|
||||
uses('model' . DS . 'model');
|
||||
}
|
||||
/**
|
||||
* Caching for Cake.
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
*/
|
||||
|
||||
if (!class_exists('HtmlHelper')) {
|
||||
uses(DS . 'view' . DS . 'helpers' . DS . 'html');
|
||||
uses('view' . DS . 'helpers' . DS . 'html');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
/**
|
||||
* Included libraries.
|
||||
*/
|
||||
uses (DS . 'view' . DS . 'helper');
|
||||
uses ('view' . DS . 'helper');
|
||||
|
||||
/**
|
||||
* View, the V in the MVC triad.
|
||||
|
|
Loading…
Add table
Reference in a new issue