Skip to content

Commit 0c256b5

Browse files
committed
Internal: Avoid double slash in sys_code_path and rel_code_path in api_get_path() (noticeable in installer)
1 parent 277b15b commit 0c256b5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

main/inc/lib/api.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ function api_get_path($path = '', $configuration = [])
917917
// Initialization of a table that contains common-purpose paths.
918918
$paths[$root_web][REL_PATH] = $root_rel;
919919
$paths[$root_web][REL_COURSE_PATH] = $root_rel.$course_folder;
920-
$paths[$root_web][REL_CODE_PATH] = $root_rel.$code_folder;
920+
$paths[$root_web][REL_CODE_PATH] = $root_rel.preg_replace('#^/#', '', $code_folder);
921921
$paths[$root_web][REL_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[$root_web][REL_PATH].'main/default_course_document/';
922922

923923
$paths[$root_web][WEB_PATH] = $slashed_root_web;
@@ -941,7 +941,7 @@ function api_get_path($path = '', $configuration = [])
941941
$paths[$root_web][WEB_HOME_PATH] = $paths[$root_web][WEB_PATH].$paths[$root_web][REL_HOME_PATH];
942942

943943
$paths[$root_web][SYS_PATH] = $root_sys;
944-
$paths[$root_web][SYS_CODE_PATH] = $root_sys.$code_folder;
944+
$paths[$root_web][SYS_CODE_PATH] = $root_sys.preg_replace('#^/#', '', $code_folder);
945945
$paths[$root_web][SYS_TEST_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_TEST_PATH];
946946
$paths[$root_web][SYS_TEMPLATE_PATH] = $paths[$root_web][SYS_CODE_PATH].$paths[$root_web][SYS_TEMPLATE_PATH];
947947
$paths[$root_web][SYS_PUBLIC_PATH] = $paths[$root_web][SYS_PATH].$paths[$root_web][SYS_PUBLIC_PATH];

0 commit comments

Comments
 (0)