Fix for bug 1736:

Invisible blocks are now not contributing to block column width calculations.

diff --git a/lib/blocklib.php b/lib/blocklib.php
index f6ea7fc1179677a3a50edc80a0d5e0623e6902ec..f0e6f50c9f68fcb1977459d01be08b926924b1c0 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -176,6 +176,10 @@ function blocks_preferred_width($blockarray, $blockinfos) {
         return 0;
     }
     foreach($blockarray as $blockid) {
+        if($blockid < 0) {
+            // Invisible block
+            return NULL;
+        }
         if(isset($blockinfos[$blockid])) {
             $blockname = $blockinfos[$blockid]->name;
             $pref = block_method_result($blockname, 'preferred_width');
@@ -959,7 +963,7 @@ function blocks_get_block_ids ($blockinfo) {
 }
 
 // This is used to register the blocks that are displayed in the course page.
-// Set in course/view.php, and read from any other place.
+// Set in course/view.php or /index.php, and read from any other place.
 function blocks_used($blocks = NULL, $records = NULL) {
     static $used = NULL;