move defaults to resources

application/Espo/Core/Utils/Config.php

@@ -38,9 +38,9 @@ use Espo\Core\Utils\File\Manager as FileManager;
  */
 class Config
 {
-    private $defaultConfigPath = 'application/Espo/Core/defaults/config.php';
+    private $defaultConfigPath = 'application/Espo/Resources/defaults/config.php';
 
-    private $systemConfigPath = 'application/Espo/Core/defaults/systemConfig.php';
+    private $systemConfigPath = 'application/Espo/Resources/defaults/systemConfig.php';
 
     protected $configPath = 'data/config.php';
 

application/Espo/Core/Utils/Layout.php

@@ -43,7 +43,7 @@ class Layout
 
     protected $changedData = [];
 
-    protected $defaultsPath = 'application/Espo/Core/defaults';
+    protected $defaultPath = 'application/Espo/Resources/defaults/layouts';
 
     protected $paths = [
         'corePath' => 'application/Espo/Resources/layouts',
@@ -106,8 +106,7 @@ class Layout
                 return Json::encode($data);
             }
 
-            $defaultPath = $this->defaultsPath;
-            $filePath = Util::concatPath(Util::concatPath($defaultPath, 'layouts'), $name . '.json' );
+            $filePath = Util::concatPath($this->defaultPath, $name . '.json' );
 
             if (!file_exists($filePath)) return null;
         }

install/index.php

@@ -74,7 +74,7 @@ $config = include('core/config.php');
 require_once 'core/SystemHelper.php';
 $systemHelper = new SystemHelper();
 
-$systemConfig = include('application/Espo/Core/defaults/systemConfig.php');
+$systemConfig = include('application/Espo/Resources/defaults/systemConfig.php');
 if (isset($systemConfig['requiredPhpVersion']) && version_compare(PHP_VERSION, $systemConfig['requiredPhpVersion'], '<')) {
     die(str_replace("{minVersion}", $systemConfig['requiredPhpVersion'], $sanitizedLangs['messages']['phpVersion']) . ".\n");
 }