← Back to branch summary

~ubuntu-branches/ubuntu/natty/moodle/natty

« back to all changes in this revision

Viewing changes to lib/simpletestlib/errors.php

  • Committer: Bazaar Package Importer
  • Author(s): Tomasz Muras
  • Date: 2010-10-30 12:19:28 UTC
  • mfrom: (1.1.12 upstream) (3.1.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20101030121928-qzobi6mctpnk4dif
Tags: 1.9.9.dfsg2-2
http://bugs.debian.org/596820
http://bugs.debian.org/601384
* Added Romanian translation
* Updated Japanese translation (closes: #596820)
* Backporting security fixes from Moodle 1.9.10 (closes: #601384)
   - Updated embedded CAS to 1.1.3
   - Added patch for MDL-24523:
     clean_text() not filtering text in markdown format
   - Added patch for MDL-24810 and upgraded customized HTML Purifier to 4.2.0 
   - Added patch for MDL-24258:
     students can delete their forum posts later than $CFG->maxeditingtime 
     under certain conditions
   - Added patch for MDL-23377:
     Can't delete quiz attempts in course without enrolled students

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/simpletestlib/errors.php
210
210
                    E_USER_ERROR => 'E_USER_ERROR',
211
211
                    E_USER_WARNING => 'E_USER_WARNING',
212
212
                    E_USER_NOTICE => 'E_USER_NOTICE');
 
213
            // Moodle additions, to prevent notices in PHP5.
 
214
            if (defined('E_RECOVERABLE_ERROR')) {
 
215
                $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
 
216
            }
 
217
            if (defined('E_DEPRECATED')) {
 
218
                $map[E_DEPRECATED] = 'E_DEPRECATED';
 
219
            }
 
220
            // End Moodle additions.
213
221
            return $map[$severity];
214
222
        }
215
223
    }