Permalink
Browse files

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

…ons"

This reverts commit 5d0d373.
  • Loading branch information...
danpoltawski committed May 28, 2012
1 parent f18dd15 commit 6bea694b6cbc3c53dd5cfce1f0ad15e1b120a550
Showing with 1 addition and 11 deletions.
  1. +1 −1 course/lib.php
  2. +0 −10 lib/conditionlib.php
View
@@ -1728,7 +1728,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) {
View
@@ -846,16 +846,6 @@ public function is_available(&$information, $grabthelot=false, $userid=0, $modin
}
}
// 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->item->visible) {
$information = '';
}
$information = trim($information);
return $available;
}

0 comments on commit 6bea694

Please sign in to comment.