MDL-6216 print_category_info no longer counts invisible courses if the user does...

diff --git a/course/lib.php b/course/lib.php
index dc9d17e2fc9e33c599d1578e7391824173cb26fa..5e0c737c9bf29b41b17958a3db82cf9ab4008fd5 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1734,8 +1734,8 @@ function print_category_info($category, $depth, $files = false) {
 
     echo "\n\n".'<table class="categorylist">';
 
+    $courses = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.guest,c.cost,c.currency');
     if ($files and $coursecount) {
-        $courses = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.guest,c.cost,c.currency');
 
         echo '<tr>';
 
@@ -1798,8 +1798,8 @@ function print_category_info($category, $depth, $files = false) {
         echo '<a '.$catlinkcss.' href="'.$CFG->wwwroot.'/course/category.php?id='.$category->id.'">'. format_string($category->name).'</a>';
         echo '</td>';
         echo '<td valign="top" class="category number">';
-        if ($category->coursecount) {
-            echo $category->coursecount;
+        if (count($courses)) {
+           echo count($courses);
         }
         echo '</td></tr>';
     }