Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

Conflicts:
	lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
This commit is contained in:
AD7six 2011-05-18 01:01:31 +02:00
commit 245d678eda

View file

@ -116,7 +116,7 @@ class CakeFixtureManager {
$pluginName = $parts[1]; $pluginName = $parts[1];
$fixture = $parts[2]; $fixture = $parts[2];
$fixturePaths = array( $fixturePaths = array(
App::pluginPath($pluginName) . 'Test' . DS . 'Fixture', CakePlugin::path($pluginName) . 'Test' . DS . 'Fixture',
TESTS . 'Fixture' TESTS . 'Fixture'
); );
} else { } else {