diff --git a/main/auth/my_progress.php b/main/auth/my_progress.php index d97737d610..2b6e2cf7bc 100755 --- a/main/auth/my_progress.php +++ b/main/auth/my_progress.php @@ -119,10 +119,10 @@ if ($show) { $careers = UserManager::getUserCareers($user_id); if (!empty($careers)) { - echo Display::page_subheader(get_lang('Careers'), null, 'h3', ['class' => 'section-title']); + $title = Display::page_subheader(get_lang('Careers'), null, 'h3', ['class' => 'section-title']); $table = new HTML_Table(['class' => 'data_table']); $table->setHeaderContents(0, 0, get_lang('Career')); - $table->setHeaderContents(0, 0, get_lang('Diagram')); + $table->setHeaderContents(0, 1, get_lang('Diagram')); $row = 1; foreach ($careers as $careerData) { @@ -132,7 +132,7 @@ if ($show) { $table->setCellContents($row, 1, $diagram); $row++; } - $content = $table->toHtml().$content; + $content = $title.$table->toHtml().$content; } } diff --git a/main/user/career_diagram.php b/main/user/career_diagram.php index 06faeaa106..b8fb0d3c9c 100644 --- a/main/user/career_diagram.php +++ b/main/user/career_diagram.php @@ -21,7 +21,7 @@ if (api_get_configuration_value('allow_career_diagram') == false) { $this_section = SECTION_PLATFORM_ADMIN; -$careerId = isset($_GET['id']) ? $_GET['id'] : 0; +$careerId = isset($_GET['career_id']) ? $_GET['career_id'] : 0; if (empty($careerId)) { api_not_allowed(true);