Merge remote branch 'origin/2.0' into 2.0-class-loading

Conflicts:
	lib/Cake/tests/cases/libs/controller/component.test.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
	lib/Cake/tests/cases/libs/controller/pages_controller.test.php
This commit is contained in:
José Lorenzo Rodríguez 2010-12-18 00:04:44 -04:30
commit 22581516db
14 changed files with 150 additions and 263 deletions

View file

@ -61,24 +61,6 @@
return true;
}
/**
* Loads component/components from LIBS. Takes optional number of parameters.
*
* Example:
*
* `uses('flay', 'time');`
*
* @param string $name Filename without the .php part
* @deprecated Will be removed in 2.0
* @link http://book.cakephp.org/view/1140/uses
*/
function uses() {
$args = func_get_args();
foreach ($args as $file) {
require_once(LIBS . strtolower($file) . '.php');
}
}
/**
* Prints out debug information about given variable.
*