D'oh - counting $totalcount wrongly (duplicate courses are ignored)

diff --git a/course/search.php b/course/search.php
index 1fbccb1439f709c8ee07a88f8f0db742cb8c628d..d8b1667b432c270a25321c27449c40389d9bd5a2 100644 (file)
--- a/course/search.php
+++ b/course/search.php
@@ -125,7 +125,6 @@
 
         // run through blocks and get (unique) courses
         $courses = array();
-        $totalcount = 0;
         foreach ($blocks as $block) {
             $courseid = $block->pageid;
             if ($courseid==0) {
@@ -135,8 +134,8 @@
                 error( "Could not read data for courseid=$courseid" );
             }
             $courses[$courseid] = $course;
-            $totalcount++;
         }
+        $totalcount = count( $courses );
     }
     // get list of courses containing modules if required
     elseif (!empty($modulelist) and confirm_sesskey()) {
@@ -147,7 +146,6 @@
 
         // run through modules and get (unique) courses
         $courses = array();
-        $totalcount = 0;
         foreach ($modules as $module) {
             $courseid = $module->course;
             if ($courseid==0) {
@@ -157,8 +155,8 @@
                 error( "Could not read data for courseid=$courseid" );
             }
             $courses[$courseid] = $course;
-            $totalcount++;
         }
+        $totalcount = count($courses);
     }
     else {
         $courses = get_courses_search($searchterms, "fullname ASC",