Fixed missing Return-link for categories and removed useless and non-working 'up' link - refs #5986

main/inc/lib/userportal.lib.php

@@ -433,8 +433,8 @@ class IndexManager {
 		if (Database::num_rows($resCats) > 0) {
 		    $htmlListCat = Display::page_header(get_lang('CatList'));
         $htmlListCat .= '<ul>';
+        $htmlTitre = '';
 			  while ($catLine = Database::fetch_array($resCats)) {
-				if ($catLine['code'] != $category) {
 				    $category_has_open_courses = self::category_has_open_courses($catLine['code']);
 				    if ($category_has_open_courses) {
 						    // The category contains courses accessible to anonymous visitors.
@@ -459,20 +459,13 @@ class IndexManager {
 		            $htmlListCat .= "</li>";
                 $thereIsSubCat = true;
             } // Else don't set thereIsSubCat to true to avoid printing things if not requested.
-				} else {
+            // TODO: deprecate this useless feature - this includes removing system variable
+            if (empty($htmlTitre)) {
 					      $htmlTitre = '<p>';
 					      if (api_get_setting('show_back_link_on_top_of_tree') == 'true') {
 				            $htmlTitre .= '<a href="'.api_get_self().'">&lt;&lt; '.get_lang('BackToHomePage').'</a>';
 				        }
-					if (!is_null($catLine['parent_id']) || (api_get_setting('show_back_link_on_top_of_tree') != 'true' && !is_null($catLine['code']))) {
-						$htmlTitre .= '<a href="'.api_get_self().'?category='.$catLine['parent_id'].'">&lt;&lt; '.get_lang('Up').'</a>';
-					}
 					      $htmlTitre .= "</p>";
-					if ($category != "" && !is_null($catLine['code'])) {
-						$htmlTitre .= '<h3>'.$catLine['name']."</h3>";
-					} else {
-						$htmlTitre .= '<h3>'.get_lang('Categories')."</h3>";
-					}
             }
       }
 			$htmlListCat .= "</ul>";