Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/main/install/install.lib.php
pull/3451/head
Yannick Warnier 4 years ago
commit bd162c81fa
  1. 4
      assets/vue/config/entrypoint.js
  2. 2
      src/CoreBundle/Manager/SettingsManager.php

@ -1 +1,3 @@
export const ENTRYPOINT = process.env.APP_API_PLATFORM_URL;
export const ENTRYPOINT = window.location.origin+'/api/';
//export const ENTRYPOINT = process.env.APP_API_PLATFORM_URL;

@ -220,7 +220,7 @@ class SettingsManager implements SettingsManagerInterface
$schemaRegister->buildSettings($settingsBuilder);
$name = $this->convertServiceToNameSpace($schema);
$settings = new Settings();
$parameters = $all[$name];
$parameters = isset($all[$name]) ? $all[$name] : [];
foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
if (array_key_exists($parameter, $parameters)) {
if ('course_creation_use_template' === $parameter) {

Loading…
Cancel
Save