Fix some behaviour of subsection display

Author: CrymSonir

block_course_modulenavigation.php

@@ -268,7 +268,7 @@ public function get_content() {
                         $thismod->subsection = $this->handle_subsection($module);
 
                         foreach ($thismod->subsection->modules as $key => $subsectionmodule) {
-                            $thismod->subsection->modules[$key] = $this->checkmodule(
+                            $modulechecked = $this->checkmodule(
                                 $subsectionmodule,
                                 $context,
                                 $completioninfo,
@@ -277,8 +277,14 @@ public function get_content() {
                                 $myactivityid,
                                 $thissection,
                             );
+                            if($modulechecked !== null) {
+                                $thismod->subsection->modules[$key] = $modulechecked;
+                            }
+                        }
+
+                        if($thismod->subsection !== null && !empty($thismod->subsection->modules)) {
+                            $thissection->modules[] = $thismod;
                         }
-                        $thissection->modules[] = $thismod;
                     } else {
                         $modulechecked = $this->checkmodule(
                             $module,
@@ -298,7 +304,9 @@ public function get_content() {
 
                 $thissection->hasmodules = (count($thissection->modules) > 0);
                 // We prevent case of section (mod_subsection) are added at the end ...
-                if ($thissection->hasmodules && $thissection->uservisible && $section->component !== "mod_subsection") {
+                if ($thissection->hasmodules
+                    && $thissection->uservisible
+                    && $section->component !== "mod_subsection") {
                     $template->sections[] = $thissection;
                 }
             }
@@ -427,7 +435,11 @@ public function handle_subsection($module) {
             );
         }
 
-        return $subsection;
+        if ($subsection->uservisible) {
+            return $subsection;
+        } else {
+            return null;
+        }
     }
 
     /**