From df2f835eebd84679aaa99d95e7fe034a1cbfb24b Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 11 Jun 2006 06:48:56 +0000
Subject: [PATCH] Merged changes from stable

---
 course/format/lams/format.php   | 4 ++--
 course/format/scorm/format.php  | 4 ++--
 course/format/social/format.php | 4 ++--
 course/format/topics/format.php | 4 ++--
 course/format/weeks/format.php  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/course/format/lams/format.php b/course/format/lams/format.php
index 6e7a8523e49..e0ee914d681 100644
--- a/course/format/lams/format.php
+++ b/course/format/lams/format.php
@@ -63,7 +63,7 @@ echo '<table id="layout-table" cellspacing="0"><tr>';
 /// The left column ...
 
 if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-    echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+    echo '<td width="'.$preferred_width_left.'" id="left-column">';
     blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
     echo '</td>';
 }
@@ -329,7 +329,7 @@ echo '</td>';
 
 // The right column
 if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-    echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+    echo '<td width="'.$preferred_width_right.'" id="right-column">';
     blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
     echo '</td>';
 }
diff --git a/course/format/scorm/format.php b/course/format/scorm/format.php
index 9a18f56a720..18b30ef9f50 100644
--- a/course/format/scorm/format.php
+++ b/course/format/scorm/format.php
@@ -25,7 +25,7 @@
     echo '<tr>';
 
     if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
         echo '</td>';
     }
@@ -41,7 +41,7 @@
 
     // The right column
     if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
         echo '</td>';
     }
diff --git a/course/format/social/format.php b/course/format/social/format.php
index cc90d1caa61..f3788728720 100644
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -23,7 +23,7 @@
     echo '<tr>';
 
     if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
         echo '</td>';
     }
@@ -51,7 +51,7 @@
 
     // The right column
     if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
         echo '</td>';
     }
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 80f2ae42454..701398bd04f 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -64,7 +64,7 @@
 /// The left column ...
 
     if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
         echo '</td>';
     }
@@ -257,7 +257,7 @@
 
     // The right column
     if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
         echo '</td>';
     }
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 72e8198a78b..0e205828439 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -55,7 +55,7 @@
 /// The left column ...
 
     if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td style="width: '.$preferred_width_left.'px;" id="left-column">';
+        echo '<td width="'.$preferred_width_left.'" id="left-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
         echo '</td>';
     }
@@ -247,7 +247,7 @@
 
     // The right column
     if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td style="width: '.$preferred_width_right.'px;" id="right-column">';
+        echo '<td width="'.$preferred_width_right.'" id="right-column">';
         blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
         echo '</td>';
     }