From 6bea694b6cbc3c53dd5cfce1f0ad15e1b120a550 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Mon, 28 May 2012 16:57:41 +0800 Subject: [PATCH] Revert "MDL-33212 Course page: Eye icon should override other conditions" This reverts commit 5d0d373733a42d1b5b25716c8d11087debd62942. --- course/lib.php | 2 +- lib/conditionlib.php | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/course/lib.php b/course/lib.php index a5566d6a6bc..648f87e86af 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1728,7 +1728,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false, // see the activity itself, or for staff) if (!$mod->uservisible) { echo '
'.$mod->availableinfo.'
'; - } 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) { diff --git a/lib/conditionlib.php b/lib/conditionlib.php index 5e2207f186c..9bcd4bbe5d2 100644 --- a/lib/conditionlib.php +++ b/lib/conditionlib.php @@ -846,16 +846,6 @@ abstract class condition_info_base { } } - // 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 ' 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; }