adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
This commit is contained in:
AD7six 2011-05-18 01:01:31 +02:00
commit 245d678eda
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

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