mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 06:25:33 +02:00
Code Issues Projects Releases Wiki Activity

MDL-55720 course: fix potential undefined variable and cleaning

Browse Source 
This commit replace $e usage by $returnfromfunc.
Indeed $returnfromfunc always exists in the scope and take $e value in case of moodle_exception.

This commit also remove useless $modcontext affectation.
This commit is contained in:
ak4t0sh 2016-11-02 23:15:45 +01:00
parent 577bd70d38
commit 70a557db24
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
course/modlib.php
View File

@ -125,12 +125,11 @@ function add_moduleinfo($moduleinfo, $course, $mform = null) {
if (!$returnfromfunc or !is_number($returnfromfunc)) {
// Undo everything we can. This is not necessary for databases which
// support transactions, but improves consistency for other databases.
$modcontext = context_module::instance($moduleinfo->coursemodule);
context_helper::delete_instance(CONTEXT_MODULE, $moduleinfo->coursemodule);
$DB->delete_records('course_modules', array('id'=>$moduleinfo->coursemodule));
if ($e instanceof moodle_exception) {
throw $e;
if ($returnfromfunc instanceof moodle_exception) {
throw $returnfromfunc;
} else if (!is_number($returnfromfunc)) {
print_error('invalidfunction', '', course_get_url($course, $moduleinfo->section));
} else {