mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
Conflicts: lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
This commit is contained in:
commit
245d678eda
1 changed files with 1 additions and 1 deletions
|
@ -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 {
|
||||||
|
|
Loading…
Reference in a new issue