Skip to content

Commit e20db3e

Browse files
authored
Revert "Internal: Fix CLI error when retrieving settings with api_get_setting - refs BT#21987"
1 parent 3d6dd1f commit e20db3e

File tree

2 files changed

+1
-30
lines changed

2 files changed

+1
-30
lines changed

public/main/inc/global.inc.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
}
4747

4848
$container = $kernel->getContainer();
49-
Container::setContainer($container);
5049
$router = $container->get('router');
5150
$context = $router->getContext();
5251
$router->setContext($context);

public/main/inc/lib/api.lib.php

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
2525
use Symfony\Component\Security\Core\User\UserInterface;
2626
use Symfony\Component\Validator\Constraints as Assert;
27+
use Symfony\Component\Yaml\Yaml;
2728
use ZipStream\Option\Archive;
2829
use ZipStream\ZipStream;
2930
use Chamilo\CoreBundle\Component\Utils\ActionIcon;
@@ -2685,35 +2686,6 @@ function api_get_session_condition(
26852686
*/
26862687
function api_get_setting($variable, $isArray = false, $key = null)
26872688
{
2688-
if ('cli' === php_sapi_name()) {
2689-
$entityManager = Database::getManager();
2690-
if (false !== strpos($variable, '.')) {
2691-
[$category, $variable] = explode('.', $variable, 2);
2692-
$repository = $entityManager->getRepository(SettingsCurrent::class);
2693-
$setting = $repository->findOneBy([
2694-
'category' => $category,
2695-
'variable' => $variable
2696-
]);
2697-
} else {
2698-
$repository = $entityManager->getRepository(SettingsCurrent::class);
2699-
$setting = $repository->findOneBy(['variable' => $variable]);
2700-
}
2701-
2702-
if ($setting) {
2703-
$settingValue = $setting->getSelectedValue();
2704-
if (is_string($settingValue) && $isArray && !empty($settingValue)) {
2705-
$decodedValue = json_decode($settingValue, true);
2706-
if (is_array($decodedValue)) {
2707-
return $decodedValue;
2708-
}
2709-
}
2710-
2711-
return $settingValue;
2712-
}
2713-
2714-
return '';
2715-
}
2716-
27172689
$settingsManager = Container::getSettingsManager();
27182690
if (empty($settingsManager)) {
27192691
return '';

0 commit comments

Comments
 (0)