diff --git a/main/inc/lib/banner.lib.php b/main/inc/lib/banner.lib.php index e55b13d9c1..f800e09e56 100755 --- a/main/inc/lib/banner.lib.php +++ b/main/inc/lib/banner.lib.php @@ -596,8 +596,9 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) continue; } if ($breadcrumb_step['url'] != '#') { - $sep = (strrchr($breadcrumb_step['url'], '?') ? '&' : '?'); - $navigation_item['url'] = $breadcrumb_step['url'].$sep.api_get_cidreq(); + $sep = strrchr($breadcrumb_step['url'], '?') ? '&' : '?'; + $courseParams = strpos($breadcrumb_step['url'], 'cidReq') === false ? api_get_cidreq() : ''; + $navigation_item['url'] = $breadcrumb_step['url'].$sep.$courseParams; } else { $navigation_item['url'] = '#'; } @@ -627,6 +628,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) // we cut the string depending of the MAX_LENGTH_BREADCRUMB value $navigation_item['title'] = cut($navigation_item['title'], MAX_LENGTH_BREADCRUMB); $navigation_item['title'] = Security::remove_XSS($navigation_item['title']); + $navigation[] = $navigation_item; } } @@ -649,6 +651,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) } } + // part 3: The tool itself. If we are on the course homepage we do not want // to display the title of the course because this // is the same as the first part of the breadcrumbs (see part 1) @@ -671,6 +674,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) } } + $html = ''; /* Part 4 . Show the teacher view/student view button at the right of the breadcrumb */ @@ -723,8 +727,8 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) $html .= $view; $html .= Display::tag('ul', $lis, array('class'=>'breadcrumb')); } - } + } return $html; }