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

Removing extra directory separators in uses() paths

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3953 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-11-25 04:31:26 +00:00
parent c308326555
commit 11d5b0fa7b
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/bootstrap.php
View file

@ -112,12 +112,12 @@ if (!defined('PHP5')) {
$filename = CACHE . 'views' . DS . convertSlash($uri) . '.php'; $filename = CACHE . 'views' . DS . convertSlash($uri) . '.php';
if (file_exists($filename)) { if (file_exists($filename)) {
uses(DS . 'controller' . DS . 'component', DS . 'view' . DS . 'view'); uses('controller' . DS . 'component', DS . 'view' . DS . 'view');
$v = null; $v = null;
$view = new View($v); $view = new View($v);
$view->renderCache($filename, $TIME_START); $view->renderCache($filename, $TIME_START);
} elseif(file_exists(CACHE . 'views' . DS . convertSlash($uri) . '_index.php')) { } 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; $v = null;
$view = new View($v); $view = new View($v);
$view->renderCache(CACHE . 'views' . DS . convertSlash($uri) . '_index.php', $TIME_START); $view->renderCache(CACHE . 'views' . DS . convertSlash($uri) . '_index.php', $TIME_START);

2
cake/dispatcher.php
View file

@ -317,7 +317,7 @@ class Dispatcher extends Object {
$classVars = get_object_vars($controller); $classVars = get_object_vars($controller);
if ($missingAction && in_array('scaffold', array_keys($classVars))) { if ($missingAction && in_array('scaffold', array_keys($classVars))) {
uses(DS.'controller'.DS.'scaffold'); uses('controller'. DS . 'scaffold');
return new Scaffold($controller, $params); return new Scaffold($controller, $params);
} else { } else {
$output = call_user_func_array(array(&$controller, $params['action']), empty($params['pass'])? null: $params['pass']); $output = call_user_func_array(array(&$controller, $params['action']), empty($params['pass'])? null: $params['pass']);

2
cake/libs/cache.php
View file

@ -31,7 +31,7 @@
* *
*/ */
if (!class_exists('Model')) { if (!class_exists('Model')) {
uses(DS . 'model' . DS . 'model'); uses('model' . DS . 'model');
} }
/** /**
* Caching for Cake. * Caching for Cake.

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

@ -34,7 +34,7 @@
*/ */
if (!class_exists('HtmlHelper')) { if (!class_exists('HtmlHelper')) {
uses(DS . 'view' . DS . 'helpers' . DS . 'html'); uses('view' . DS . 'helpers' . DS . 'html');
} }
/** /**

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

@ -30,7 +30,7 @@
/** /**
* Included libraries. * Included libraries.
*/ */
uses (DS . 'view' . DS . 'helper'); uses ('view' . DS . 'helper');
/** /**
* View, the V in the MVC triad. * View, the V in the MVC triad.