Merge branch 'MDL-47790-27' of git://github.com/jethac/moodle into MO…

…ODLE_27_STABLE
moodle · Oct 29, 2014 · f9aab38 · f9aab38
2 parents df0a353 + 4316329
commit f9aab38
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
@@ -1581,7 +1581,11 @@ public static function table(html_table $table) {
 
             foreach ($table->data as $key => $row) {
                 if (($row === 'hr') && ($countcols)) {
-                    $output .= html_writer::tag('td', html_writer::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
+                    $output .= html_writer::start_tag('tr');
+                    $output .= html_writer::start_tag('td', array('colspan' => $countcols));
+                    $output .= html_writer::tag('div', '', array('class' => 'tabledivider'));
+                    $output .= html_writer::end_tag('td');
+                    $output .= html_writer::end_tag('tr') . "\n";
                 } else {
                     // Convert array rows to html_table_rows and cell strings to html_table_cell objects
                     if (!($row instanceof html_table_row)) {
@@ -1655,8 +1659,8 @@ public static function table(html_table $table) {
                         }
                         $output .= html_writer::tag($tagtype, $cell->text, $tdattributes) . "\n";
                     }
+                    $output .= html_writer::end_tag('tr') . "\n";
                 }
-                $output .= html_writer::end_tag('tr') . "\n";
             }
             $output .= html_writer::end_tag('tbody') . "\n";
         }