Revert "MDL-33212 Course page: Eye icon should override other conditions"

This reverts commit 805366d987.

course/lib.php

@@ -1763,7 +1763,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             // see the activity itself, or for staff)
             if (!$mod->uservisible) {
                 echo '<div class="availabilityinfo">'.$mod->availableinfo.'</div>';
-            } else if ($canviewhidden && !empty($CFG->enableavailability) && $mod->visible) {
+            } else if ($canviewhidden && !empty($CFG->enableavailability)) {
                 $ci = new condition_info($mod);
                 $fullinfo = $ci->get_full_information();
                 if($fullinfo) {

lib/conditionlib.php

@@ -486,16 +486,6 @@ WHERE
             }
         }
 
-        // If the item is marked as 'not visible' then we don't change the available
-        // flag (visible/available are treated distinctly), but we remove any
-        // availability info. If the item is hidden with the eye icon, it doesn't
-        // make sense to show 'Available from <date>' or similar, because even
-        // when that date arrives it will still not be available unless somebody
-        // toggles the eye icon.
-        if (!$this->cm->visible) {
-            $information = '';
-        }
-
         $information=trim($information);
         return $available;
     }