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

You know you are beyond hope of redemption when you make "API uniformity" changes. ;-)

Browse Source
This commit is contained in:
defacer
2005-03-02 05:56:24 +00:00
parent 664923229c
commit dffd4bb948
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/format/social/format.php
+2 -2
View File
@@ -25,7 +25,7 @@
echo '<table id="layout-table">';
echo '<tr>';
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';
@@ -54,7 +54,7 @@
echo '</td>';
// The right column
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
if(blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
echo '</td>';
course/format/topics/format.php
+2 -2
View File
@@ -63,7 +63,7 @@
/// The left column ...
if (blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';
@@ -254,7 +254,7 @@
echo '</td>';
// The right column
if (blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
echo '</td>';
course/format/weeks/format.php
+2 -2
View File
@@ -54,7 +54,7 @@
/// The left column ...
if (blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';
@@ -244,7 +244,7 @@
echo '</td>';
// The right column
if (blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing) {
if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
echo '</td>';
index.php
+2 -2
View File
@@ -69,7 +69,7 @@
<tr>
<?PHP
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $editing) {
if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';
@@ -180,7 +180,7 @@
// The right column
if(blocks_have_content($pageblocks[BLOCK_POS_RIGHT]) || $editing || isadmin()) {
if(blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing || isadmin()) {
echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
if (isadmin()) {
echo '<div align="center">'.update_course_icon($SITE->id).'</div>';
lib/blocklib.php
+2 -2
View File
@@ -169,8 +169,8 @@ function blocks_delete_instance($instance) {
// Accepts an array of block instances and checks to see if any of them have content to display
// (causing them to calculate their content in the process). Returns true or false. Parameter passed
// by reference for speed; the array is actually not modified.
function blocks_have_content(&$instances) {
foreach($instances as $instance) {
function blocks_have_content(&$pageblocks, $position) {
foreach($pageblocks[$position] as $instance) {
if (!$instance->visible) {
continue;
}
mod/chat/view.php
+1 -1
View File
@@ -69,7 +69,7 @@
echo '<table id="layout-table"><tr>';
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $PAGE->user_is_editing()) {
if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';
mod/quiz/view.php
+1 -1
View File
@@ -67,7 +67,7 @@
echo '<table id="layout-table"><tr>';
if(blocks_have_content($pageblocks[BLOCK_POS_LEFT]) || $PAGE->user_is_editing()) {
if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) {
echo '<td style="width: '.$blocks_preferred_width.'px;" id="left-column">';
blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
echo '</td>';