Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

pull/2487/head
Yannick Warnier 9 years ago
commit a884ebd587
  1. 22
      main/inc/lib/api.lib.php

@ -655,7 +655,7 @@ function api_get_path($path = '', $configuration = [])
$emptyConfigurationParam = false;
if (empty($configuration)) {
$configuration = (array) $_configuration;
$configuration = (array)$_configuration;
$emptyConfigurationParam = true;
}
@ -696,17 +696,17 @@ function api_get_path($path = '', $configuration = [])
// Here we give up, so we don't touch anything.
}
}
}
if (isset($configuration['multiple_access_urls']) && $configuration['multiple_access_urls']) {
// To avoid that the api_get_access_url() function fails since global.inc.php also calls the main_api.lib.php
if (isset($configuration['access_url']) && !empty($configuration['access_url'])) {
// We look into the DB the function api_get_access_url
$url_info = api_get_access_url($configuration['access_url']);
// Avoid default value
$defaulValues = ['http://localhost/', 'https://localhost/'];
if (!empty($url_info['url']) && !in_array($url_info['url'], $defaulValues)) {
$root_web = $url_info['active'] == 1 ? $url_info['url'] : $configuration['root_web'];
}
if (isset($configuration['multiple_access_urls']) && $configuration['multiple_access_urls']) {
// To avoid that the api_get_access_url() function fails since global.inc.php also calls the main_api.lib.php
if (isset($configuration['access_url']) && !empty($configuration['access_url'])) {
// We look into the DB the function api_get_access_url
$url_info = api_get_access_url($configuration['access_url']);
// Avoid default value
$defaulValues = ['http://localhost/', 'https://localhost/'];
if (!empty($url_info['url']) && !in_array($url_info['url'], $defaulValues)) {
$root_web = $url_info['active'] == 1 ? $url_info['url'] : $configuration['root_web'];
}
}
}

Loading…
Cancel
Save