Merge from 1.6 branch.

diff --git a/lib/blocklib.php b/lib/blocklib.php
index c152fd44b1171dead8d0b370ae18b1206b2269af..6196d01427309db9f475f88a5100472ba3615998 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -240,7 +240,7 @@ function blocks_have_content(&$pageblocks, $position) {
         if(!$obj->is_empty()) {
             // cache rec and obj 
             // for blocks_print_group()
-            $instance->rec = $rec;
+            $instance->rec = $record;
             $instance->obj = $obj; 
             return true;
         }