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

Merge branch 'MDL-47790-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2014-10-29 15:50:19 +08:00
parent a001ca90b4 18e749e45e
commit 02b80f49d4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputcomponents.php
+6 -2
View File
@@ -1562,7 +1562,11 @@ class html_writer {
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)) {
@@ -1636,8 +1640,8 @@ class html_writer {
}
$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";
}