Pass the current course to the block class when creating it to find the name

of the block.   This allows the class to return different result depending
on the course it is in.

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 52a1c98ba279cfb90cfd0f8fe40249bd2bb04456..f6ea7fc1179677a3a50edc80a0d5e0623e6902ec 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -355,7 +355,7 @@ function block_find($blockid, $leftblocks, $rightblocks) {
 }
 
 //This function prints the block to admin blocks as necessary
-function block_print_blocks_admin($course, $missingblocks) {
+function block_print_blocks_admin(&$course, $missingblocks) {
     if (isediting($course->id)) {
         $strblocks = get_string('blocks');
         $stradd    = get_string('add');
@@ -363,7 +363,7 @@ function block_print_blocks_admin($course, $missingblocks) {
             $blockdata = get_records_list('blocks', 'id', implode(',', $missingblocks));
             if ($blockdata !== false) {
                 foreach ($blockdata as $block) {
-                    $blockobject = block_instance($block->name, NULL);
+                    $blockobject = block_instance($block->name, $course);
                     if ($blockobject === false) {
                         continue;
                     }