@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | defined('PHILE_VERSION') || define('PHILE_VERSION', '1.8.0'); |
| 85 | 85 | defined('PHILE_CLI_MODE') || define('PHILE_CLI_MODE', (php_sapi_name() === 'cli')); |
| 86 | 86 | defined('DS') || define('DS', DIRECTORY_SEPARATOR); |
| 87 | - defined('ROOT_DIR') || define('ROOT_DIR', realpath(__DIR__ . DS . '..' . DS . '..' . DS) . DS); |
|
| 88 | - defined('CONTENT_DIR') || define('CONTENT_DIR', ROOT_DIR . 'content' . DS); |
|
| 87 | + defined('ROOT_DIR') || define('ROOT_DIR', realpath(__DIR__.DS.'..'.DS.'..'.DS).DS); |
|
| 88 | + defined('CONTENT_DIR') || define('CONTENT_DIR', ROOT_DIR.'content'.DS); |
|
| 89 | 89 | defined('CONTENT_EXT') || define('CONTENT_EXT', '.md'); |
| 90 | - defined('LIB_DIR') || define('LIB_DIR', ROOT_DIR . 'lib' . DS); |
|
| 91 | - defined('PLUGINS_DIR') || define('PLUGINS_DIR', ROOT_DIR . 'plugins' . DS); |
|
| 92 | - defined('THEMES_DIR') || define('THEMES_DIR', ROOT_DIR . 'themes' . DS); |
|
| 93 | - defined('CACHE_DIR') || define('CACHE_DIR', LIB_DIR . 'cache' . DS); |
|
| 94 | - defined('STORAGE_DIR') || define('STORAGE_DIR', LIB_DIR . 'datastorage' . DS); |
|
| 90 | + defined('LIB_DIR') || define('LIB_DIR', ROOT_DIR.'lib'.DS); |
|
| 91 | + defined('PLUGINS_DIR') || define('PLUGINS_DIR', ROOT_DIR.'plugins'.DS); |
|
| 92 | + defined('THEMES_DIR') || define('THEMES_DIR', ROOT_DIR.'themes'.DS); |
|
| 93 | + defined('CACHE_DIR') || define('CACHE_DIR', LIB_DIR.'cache'.DS); |
|
| 94 | + defined('STORAGE_DIR') || define('STORAGE_DIR', LIB_DIR.'datastorage'.DS); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | spl_autoload_extensions(".php"); |
| 103 | 103 | // load phile core |
| 104 | 104 | spl_autoload_register( |
| 105 | - function ($className) { |
|
| 106 | - $fileName = LIB_DIR . str_replace("\\", DS, $className) . '.php'; |
|
| 105 | + function($className) { |
|
| 106 | + $fileName = LIB_DIR.str_replace("\\", DS, $className).'.php'; |
|
| 107 | 107 | if (file_exists($fileName)) { |
| 108 | 108 | include_once $fileName; |
| 109 | 109 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | // load phile plugins |
| 113 | 113 | spl_autoload_register('\Phile\Plugin\PluginRepository::autoload'); |
| 114 | 114 | |
| 115 | - include LIB_DIR . 'vendor' . DS . 'autoload.php'; |
|
| 115 | + include LIB_DIR.'vendor'.DS.'autoload.php'; |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | protected function initializeConfiguration() |
| 122 | 122 | { |
| 123 | - $defaults = Utility::load(ROOT_DIR . 'default_config.php'); |
|
| 124 | - $localSettings = Utility::load(ROOT_DIR . 'config.php'); |
|
| 123 | + $defaults = Utility::load(ROOT_DIR.'default_config.php'); |
|
| 124 | + $localSettings = Utility::load(ROOT_DIR.'config.php'); |
|
| 125 | 125 | if (is_array($localSettings)) { |
| 126 | 126 | $this->settings = array_replace_recursive($defaults, $localSettings); |
| 127 | 127 | } else { |