L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
developers who use pages. Conversely simplified the code a bit in courses.
This commit is contained in:
defacer
2005-02-02 02:41:56 +00:00
parent 7c6c051326
commit c1d8705fd2
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/format/social/format.php
+2 -2
View File
@@ -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>';
}
course/format/topics/format.php
+2 -2
View File
@@ -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>';
}
course/format/weeks/format.php
+2 -2
View File
@@ -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>';
}
index.php
+2 -4
View File
@@ -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>';
}
lib/blocklib.php
+5 -3
View File
@@ -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);