Pass the whole $course variable to block_print_blocks_admin()

so we have more information.

diff --git a/course/format/social/format.php b/course/format/social/format.php
index cf57ea5bbd5cc482f5364b828ad92aa7f15d9aab..72a8f1dc1a3b5aacf9350cfe959c7097ff927108 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -57,7 +57,7 @@
       echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">';
       print_course_blocks($course, $rightblocks, BLOCK_RIGHT);
       if ($editing && !empty($missingblocks)) {
-          block_print_blocks_admin($course->id, $missingblocks);
+          block_print_blocks_admin($course, $missingblocks);
       }
       print_spacer(1, 120, true);
       echo '</td>';

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 6412a992bd1dcbd3a8e1b9d98bcd93b9f5286f58..f8ffa6ad5f3bcc836c709d37df07b4e638505b3b 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -281,7 +281,7 @@
         echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">';
         print_course_blocks($course, $rightblocks, BLOCK_RIGHT);
         if ($editing && !empty($missingblocks)) {
-            block_print_blocks_admin($course->id, $missingblocks);
+            block_print_blocks_admin($course, $missingblocks);
         }
         print_spacer(1, 120, true);
         echo '</td>';

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 69c6c63315c1d40fff7a63bdc8b8ecf6b2fba716..7175cc3d13aa447c714eaa4bdf792720e0d08f4c 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -267,7 +267,7 @@
         echo '<td style="vertical-align: top; width: '.$preferred_width_right.'px;">';
         print_course_blocks($course, $rightblocks, BLOCK_RIGHT);
         if ($editing && !empty($missingblocks)) {
-            block_print_blocks_admin($course->id, $missingblocks);
+            block_print_blocks_admin($course, $missingblocks);
         }
         print_spacer(1, 120, true);
        echo '</td>';

diff --git a/index.php b/index.php
index 44a99b4cf57645bcfae5bbaf4b7eb432e8220a7b..42688880355aeef3547e1956b897cbe4a490ff24 100644 (file)
--- a/index.php
+++ b/index.php
@@ -216,7 +216,7 @@
         }
         print_course_blocks($site, $rightblocks, BLOCK_RIGHT);
         if ($editing && !empty($missingblocks)) {
-            block_print_blocks_admin($site->id, $missingblocks);
+            block_print_blocks_admin($site, $missingblocks);
         }
         echo '</td>';
     }

diff --git a/lib/blocklib.php b/lib/blocklib.php
index a003ba787cbb2a13cb394d93bab90c6774fc8282..52a1c98ba279cfb90cfd0f8fe40249bd2bb04456 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -355,8 +355,8 @@ function block_find($blockid, $leftblocks, $rightblocks) {
 }
 
 //This function prints the block to admin blocks as necessary
-function block_print_blocks_admin($courseid, $missingblocks) {
-    if (isediting($courseid)) {
+function block_print_blocks_admin($course, $missingblocks) {
+    if (isediting($course->id)) {
         $strblocks = get_string('blocks');
         $stradd    = get_string('add');
         if (!empty($missingblocks)) {
@@ -370,13 +370,13 @@ function block_print_blocks_admin($courseid, $missingblocks) {
                     $menu[$block->id] = $blockobject->get_title();
                 }
 
-                if($courseid == 1) {
+                if($course->id == 1) {
                     $target = 'index.php';
                 }
                 else {
                     $target = 'view.php';
                 }
-                $content = popup_form($target.'?id='.$courseid.'&blockaction=add&blockid=',
+                $content = popup_form($target.'?id='.$course->id.'&blockaction=add&blockid=',
                                       $menu, 'add_block', '', "$stradd...", '', '', true);
                 $content = '<div align="center">'.$content.'</div>';
                 print_side_block($strblocks, $content, NULL, NULL, NULL);