Skip to content

Commit

Permalink
Merge pull request #11196 from cakephp/issue-11189-redux
Browse files Browse the repository at this point in the history
Fix: I got confused which was needle and which was the haystack
  • Loading branch information
robertpustulka committed Sep 15, 2017
2 parents eb61abf + 9f2746c commit 639a1c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Core/Plugin.php
Expand Up @@ -189,7 +189,7 @@ protected static function _loadConfig()
$vendorFile = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'cakephp-plugins.php';
if (!file_exists($vendorFile)) {
$vendorFile = dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'cakephp-plugins.php';
if (strpos(ROOT, $vendorFile) === false || !file_exists($vendorFile)) {
if (strpos($vendorFile, ROOT) !== 0 || !file_exists($vendorFile)) {
Configure::write(['plugins' => []]);

return;
Expand Down

0 comments on commit 639a1c7

Please sign in to comment.