Skip to content

Commit

Permalink
Revert "Check for the full stack based path first."
Browse files Browse the repository at this point in the history
This reverts commit 80a1987. By
checking the full-stack path first, we run the risk of loading the
incorrect cakephp-plugins.php file as we're reaching outside of the
application root directory.

Refs #8055
  • Loading branch information
markstory committed Jan 18, 2016
1 parent ba998bd commit 72a9d0f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Core/Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ protected static function _loadConfig()
if (Configure::check('plugins')) {
return;
}
$vendorFile = dirname(dirname(dirname(dirname(__DIR__)))) . DS . 'cakephp-plugins.php';
$vendorFile = dirname(dirname(__DIR__)) . DS . 'cakephp-plugins.php';
if (!file_exists($vendorFile)) {
$vendorFile = dirname(dirname(__DIR__)) . DS . 'cakephp-plugins.php';
$vendorFile = dirname(dirname(dirname(dirname(__DIR__)))) . DS . 'cakephp-plugins.php';
if (!file_exists($vendorFile)) {
Configure::write(['plugins' => []]);
return;
Expand Down

0 comments on commit 72a9d0f

Please sign in to comment.