← Back to branch summary

~ubuntu-branches/ubuntu/trusty/moodle/trusty

« back to all changes in this revision

Viewing changes to lib/conditionlib.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2014-01-21 13:40:52 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20140121134052-ym2qvsp2cd9vq0p6
Tags: 2.5.4-1
http://bugs.debian.org/735312
* New upstream release, fixing security issues:
  - MSA-14-0001 Config passwords visibility issue [CVE-2014-0008]
  - MSA-14-0002 Group constraints lacking in "login as" [CVE-2014-0009]
  - MSA-14-0003 CSRF vulnerability in profile fields [CVE-2014-0010]
* Move /var/lib/moodle directory into package.
* Revert back to bundled yui3. Unfortunately, version in Debian and
  of upstream are not compatible (closes: #735312).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/conditionlib.php
919
919
        if (!empty($information)) {
920
920
            $li = strpos($information, '<li>', 4);
921
921
            if ($li === false) {
922
 
                $information = preg_replace('~^<li>(.*)</li>$~', '$1', $information);
 
922
                $information = preg_replace('~^\s*<li>(.*)</li>\s*$~s', '$1', $information);
923
923
            } else {
924
924
                $information = html_writer::tag('ul', $information);
925
925
            }
1127
1127
        if (!empty($information)) {
1128
1128
            $li = strpos($information, '<li>', 4);
1129
1129
            if ($li === false) {
1130
 
                $information = preg_replace('~^<li>(.*)</li>$~', '$1', $information);
 
1130
                $information = preg_replace('~^\s*<li>(.*)</li>\s*$~s', '$1', $information);
1131
1131
            } else {
1132
1132
                $information = html_writer::tag('ul', $information);
1133
1133
            }