Skip to content

Commit

Permalink
Revert "Fix: Do not load cakephp-plugins from outside of ROOT"
Browse files Browse the repository at this point in the history
This reverts merge commit b85ef39 and
commit 1597e6f.

This broke workflow for plugins based on usemuffin/skeleton.

Reported-By: robertpustulka
  • Loading branch information
rchavik committed Sep 19, 2017
1 parent 173293f commit 32cdb64
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($vendorFile, ROOT) !== 0 || !file_exists($vendorFile)) {
if (!file_exists($vendorFile)) {
Configure::write(['plugins' => []]);

return;
Expand Down

0 comments on commit 32cdb64

Please sign in to comment.