Merged changes from stable

diff --git a/course/format/lams/format.php b/course/format/lams/format.php
index 6e7a8523e494b187dc2af8b40eb409c8eb418c77..e0ee914d681d1247d2b08e104f78ed65723bcd1b 100644 (file)
--- 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 9a18f56a720de9688fd41808145ce2a20f8af9da..18b30ef9f501ac09e6c50fe01c4e28bfba6760ac 100644 (file)
--- 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 cc90d1caa61f68b0a033c7c0000786a1e86f64c1..f37887287201f01ac2d1cc1df72f5d233acf2e3e 100644 (file)
--- 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 80f2ae42454a0fc818c9774bf7ad4ea84fb56593..701398bd04fef5a2c4abff765fe898d54f947940 100644 (file)
--- 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 72e8198a78bfdbac6ae35983d30c584dc46ad09f..0e205828439335b2ed123e09359a024e34f43364 100644 (file)
--- 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>';
     }