From aec0241a4cbad40ff80f4de46aeff679cddac7b5 Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 26 Feb 2015 12:49:04 -0500 Subject: [PATCH] Make global paths for vendors and plugins based on ROOT. Using CAKE means that composer installed CakePHP will generate incorrect 'global' paths. Refs #5838 --- lib/Cake/Core/App.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index ff8fe4c9e3f..dd72b9048e7 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -874,11 +874,11 @@ protected static function _packageFormat() { ), 'Vendor' => array( '%s' . 'Vendor' . DS, - dirname(dirname(CAKE)) . DS . 'vendors' . DS, + ROOT . DS . 'vendors' . DS, ), 'Plugin' => array( APP . 'Plugin' . DS, - dirname(dirname(CAKE)) . DS . 'plugins' . DS + ROOT . DS . 'plugins' . DS ) ); }