|
@@ -40,7 +40,7 @@ discard block |
|
|
block discarded – undo |
|
40
|
40
|
$this->object = $config; |
|
41
|
41
|
$configurationDir = $this->configurationDir; |
|
42
|
42
|
if ($configurationDir === null) { |
|
43
|
|
- $path = realpath(__DIR__ . '/../../../../..'); // Get out of the Magium directories |
|
|
43
|
+ $path = realpath(__DIR__.'/../../../../..'); // Get out of the Magium directories |
|
44
|
44
|
$count = 0; |
|
45
|
45
|
while ($count++ < 10) { |
|
46
|
46
|
$filename = "{$path}/configuration"; |
|
@@ -61,8 +61,8 @@ discard block |
|
|
block discarded – undo |
|
61
|
61
|
|
|
62
|
62
|
if (!is_dir($configurationDir)) return; |
|
63
|
63
|
|
|
64
|
|
- $configurationFile = get_class($config) . '.php'; |
|
65
|
|
- $configurationFile = $configurationDir . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $configurationFile); |
|
|
64
|
+ $configurationFile = get_class($config).'.php'; |
|
|
65
|
+ $configurationFile = $configurationDir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $configurationFile); |
|
66
|
66
|
|
|
67
|
67
|
if (file_exists($configurationFile)) { |
|
68
|
68
|
include $configurationFile; |
Please login to merge, or discard this patch.