Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle

This commit is contained in:
Damyon Wiese
2013-11-18 14:55:18 +08:00
+2 -2
View File
@@ -909,7 +909,7 @@ abstract class condition_info_base {
if (!empty($information)) {
$li = strpos($information, '<li>', 4);
if ($li === false) {
$information = preg_replace('~^<li>(.*)</li>$~', '$1', $information);
$information = preg_replace('~^\s*<li>(.*)</li>\s*$~s', '$1', $information);
} else {
$information = html_writer::tag('ul', $information);
}
@@ -1106,7 +1106,7 @@ abstract class condition_info_base {
if (!empty($information)) {
$li = strpos($information, '<li>', 4);
if ($li === false) {
$information = preg_replace('~^<li>(.*)</li>$~', '$1', $information);
$information = preg_replace('~^\s*<li>(.*)</li>\s*$~s', '$1', $information);
} else {
$information = html_writer::tag('ul', $information);
}