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

« back to all changes in this revision

Viewing changes to question/engine/datalib.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
* 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:
1294
1294
        if ($text !== '') {
1295
1295
            $text = preg_replace('/\s*<!-- File hash: \w+ -->\s*$/', '', $text);
1296
1296
            $text = file_rewrite_urls_to_pluginfile($text, $draftitemid);
1297
 
            $text .= '<!-- File hash: ' . $hash . ' -->';
 
1297
            if ($string) {
 
1298
                $text .= '<!-- File hash: ' . $hash . ' -->';
 
1299
            }
1298
1300
        }
1299
1301
        return $text;
1300
1302
    }