From 11d5b0fa7b40ecafe068dd90576959064c79c219 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Sat, 25 Nov 2006 04:31:26 +0000
Subject: [PATCH] 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
---
 cake/bootstrap.php              | 4 ++--
 cake/dispatcher.php             | 2 +-
 cake/libs/cache.php             | 2 +-
 cake/libs/view/helpers/text.php | 2 +-
 cake/libs/view/view.php         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index e3fb562ff..6c2288ab6 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -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);
diff --git a/cake/dispatcher.php b/cake/dispatcher.php
index 58ce9da34..59a06db45 100644
--- a/cake/dispatcher.php
+++ b/cake/dispatcher.php
@@ -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']);
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index 0bf2f9c8b..42e39cdaf 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -31,7 +31,7 @@
  *
  */
 	if (!class_exists('Model')) {
-		 uses(DS . 'model' . DS . 'model');
+		 uses('model' . DS . 'model');
 	}
 /**
  * Caching for Cake.
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index 93b1b81f1..a69920554 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -34,7 +34,7 @@
  */
 
 if (!class_exists('HtmlHelper')) {
-	uses(DS . 'view' . DS . 'helpers' . DS . 'html');
+	uses('view' . DS . 'helpers' . DS . 'html');
 }
 
 /**
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index d66d8e285..ab43c393b 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -30,7 +30,7 @@
 /**
  * Included libraries.
  */
-uses (DS . 'view' . DS . 'helper');
+uses ('view' . DS . 'helper');
 
 /**
  * View, the V in the MVC triad.