Revert "Internal: Fix CLI error when retrieving settings with api_get_setting - refs BT#21987" (#5791)

pull/5790/head
Angel Fernando Quiroz Campos 1 year ago committed by GitHub
parent 3d6dd1f39d
commit 153fdb1e32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      public/main/inc/global.inc.php
  2. 30
      public/main/inc/lib/api.lib.php

@ -46,7 +46,6 @@ if ($isCli) {
}
$container = $kernel->getContainer();
Container::setContainer($container);
$router = $container->get('router');
$context = $router->getContext();
$router->setContext($context);

@ -24,6 +24,7 @@ use Symfony\Component\Mime\Address;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Yaml\Yaml;
use ZipStream\Option\Archive;
use ZipStream\ZipStream;
use Chamilo\CoreBundle\Component\Utils\ActionIcon;
@ -2685,35 +2686,6 @@ function api_get_session_condition(
*/
function api_get_setting($variable, $isArray = false, $key = null)
{
if ('cli' === php_sapi_name()) {
$entityManager = Database::getManager();
if (false !== strpos($variable, '.')) {
[$category, $variable] = explode('.', $variable, 2);
$repository = $entityManager->getRepository(SettingsCurrent::class);
$setting = $repository->findOneBy([
'category' => $category,
'variable' => $variable
]);
} else {
$repository = $entityManager->getRepository(SettingsCurrent::class);
$setting = $repository->findOneBy(['variable' => $variable]);
}
if ($setting) {
$settingValue = $setting->getSelectedValue();
if (is_string($settingValue) && $isArray && !empty($settingValue)) {
$decodedValue = json_decode($settingValue, true);
if (is_array($decodedValue)) {
return $decodedValue;
}
}
return $settingValue;
}
return '';
}
$settingsManager = Container::getSettingsManager();
if (empty($settingsManager)) {
return '';

Loading…
Cancel
Save