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. 4
      main/inc/lib/api.lib.php

@ -655,7 +655,7 @@ function api_get_path($path = '', $configuration = [])
$emptyConfigurationParam = false; $emptyConfigurationParam = false;
if (empty($configuration)) { if (empty($configuration)) {
$configuration = (array) $_configuration; $configuration = (array)$_configuration;
$emptyConfigurationParam = true; $emptyConfigurationParam = true;
} }
@ -696,6 +696,7 @@ function api_get_path($path = '', $configuration = [])
// Here we give up, so we don't touch anything. // Here we give up, so we don't touch anything.
} }
} }
}
if (isset($configuration['multiple_access_urls']) && $configuration['multiple_access_urls']) { 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 // To avoid that the api_get_access_url() function fails since global.inc.php also calls the main_api.lib.php
@ -709,7 +710,6 @@ function api_get_path($path = '', $configuration = [])
} }
} }
} }
}
$paths = []; $paths = [];
// Initialise cache with default values. // Initialise cache with default values.

Loading…
Cancel
Save