Change the semantics of blocks_print_adminblock() to make life easier to

developers who use pages. Conversely simplified the code a bit in courses.

diff --git a/course/format/social/format.php b/course/format/social/format.php
index 181b31da752e9072892eda06f58a90cf60c3d8fe..e4bbd135ae70a1bb7516cb0dbc13cb073a987f62 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -57,8 +57,8 @@
     if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
         echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
-        if ($editing && !empty($missingblocks)) {
-            blocks_print_adminblock($PAGE, $missingblocks);
+        if ($editing) {
+            blocks_print_adminblock($PAGE, $pageblocks);
         }
         echo '</td>';
     }

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 9a344017b8620d72366b3e44cbf4247290000b57..84b70df3542268c40fc45212fa30bc99cb76c00a 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -273,8 +273,8 @@
     if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
         echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
-        if ($editing && !empty($missingblocks)) {
-            blocks_print_adminblock($PAGE, $missingblocks);
+        if ($editing) {
+            blocks_print_adminblock($PAGE, $pageblocks);
         }
         echo '</td>';
     }

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 9e9ca9c61a5381cba63c5d6c1b147e64f0d916bb..e27b36cffaf545b4902d473529cdbbff16ad78ff 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -259,8 +259,8 @@
     if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
         echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;" id="right-column">';
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
-        if ($editing && !empty($missingblocks)) {
-            blocks_print_adminblock($PAGE, $missingblocks);
+        if ($editing) {
+            blocks_print_adminblock($PAGE, $pageblocks);
         }
         echo '</td>';
     }

diff --git a/index.php b/index.php
index 48dfcfa8480b6e694959a3f307185762cd5b50f0..8525a2a05b4f33993e9406ff8a44c5d01007860b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -76,8 +76,6 @@
             // but I'm not sure if it's worth the complexity increase...
             $pageblocks = blocks_get_by_page($PAGE);
         }
-
-        $missingblocks = blocks_get_missing($PAGE, $pageblocks);
     }
 
     optional_variable($preferred_width_left,  blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]));
@@ -216,8 +214,8 @@
             echo '<br />';
         }
         blocks_print_group($PAGE, $pageblocks[BLOCK_POS_RIGHT]);
-        if ($editing && !empty($missingblocks)) {
-            blocks_print_adminblock($PAGE, $missingblocks);
+        if ($editing) {
+            blocks_print_adminblock($PAGE, $pageblocks);
         }
         echo '</td>';
     }

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 98e3c9c26a5ed11c4b30198f9888966eb4d931ac..fc9d00c9722dd4e866e674fffef842ef8a8d7a21 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -542,12 +542,14 @@ function blocks_get_by_page($page) {
 }
 
 //This function prints the block to admin blocks as necessary
-function blocks_print_adminblock($page, $missingblocks) {
+function blocks_print_adminblock(&$page, &$pageblocks) {
     global $USER;
 
-    $strblocks = get_string('blocks');
-    $stradd    = get_string('add');
+    $missingblocks = blocks_get_missing($page, $pageblocks);
+
     if (!empty($missingblocks)) {
+        $strblocks = get_string('blocks');
+        $stradd    = get_string('add');
         foreach ($missingblocks as $blockid) {
             $block = blocks_get_record($blockid);
             $blockobject = block_instance($block->name);