moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-04-11 00:56:45 +02:00
commit e592ccd860
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/assign/locallib.php
View file

@ -3091,6 +3091,9 @@ class assign {
public function can_view_submission($userid) { public function can_view_submission($userid) {
global $USER; global $USER;
if (is_siteadmin()) {
return true;
}
if (!is_enrolled($this->get_course_context(), $userid)) { if (!is_enrolled($this->get_course_context(), $userid)) {
return false; return false;
} }

2
mod/assign/upgradelib.php
View file

@ -301,7 +301,7 @@ class assign_upgrade_manager {
} catch (Exception $exception) { } catch (Exception $exception) {
$rollback = true; $rollback = true;
$log .= get_string('conversionexception', 'mod_assign', $exception->error); $log .= get_string('conversionexception', 'mod_assign', $exception->getMessage());
} }
if ($rollback) { if ($rollback) {