|
@@ -43,8 +43,8 @@ discard block |
|
|
block discarded – undo |
|
43
|
43
|
public function __construct(ContainerInterface $container) |
|
44
|
44
|
{ |
|
45
|
45
|
parent::__construct($container); |
|
46
|
|
- $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() .'/config/parameters.yml')); |
|
47
|
|
- $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
|
46
|
+ $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() . '/config/parameters.yml')); |
|
|
47
|
+ $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
48
|
48
|
// load and set new default values from the original parameters.yml file into the custom_parameters.yml file. |
|
49
|
49
|
$this->yamlManager->setParameters(array_merge($originalParameters['parameters'], $this->yamlManager->getParameters())); |
|
50
|
50
|
$this->currentVersion = $this->container->getParameter(ZikulaKernel::CORE_INSTALLED_VERSION_PARAM); |
|
@@ -55,7 +55,7 @@ discard block |
|
|
block discarded – undo |
|
55
|
55
|
$stage = $request->request->get('stage'); |
|
56
|
56
|
$this->container->setParameter('upgrading', true); |
|
57
|
57
|
$status = $this->executeStage($stage); |
|
58
|
|
- $response = ['status' => (bool) $status]; |
|
|
58
|
+ $response = ['status' => (bool)$status]; |
|
59
|
59
|
if (is_array($status)) { |
|
60
|
60
|
$response['results'] = $status; |
|
61
|
61
|
} |
Please login to merge, or discard this patch.