Permalink
Browse files

Merge branch 'MDL-38525-23' of https://github.com/damyon/moodle into …

…MOODLE_23_STABLE
  • Loading branch information...
2 parents b3e792b + 557383c commit f3d49933b035010cbc5348271a8aa5544701c763 @stronk7 stronk7 committed Apr 10, 2013
Showing with 4 additions and 1 deletion.
  1. +3 −0 mod/assign/locallib.php
  2. +1 −1 mod/assign/upgradelib.php
@@ -2061,6 +2061,9 @@ private function is_graded($userid) {
public function can_view_submission($userid) {
global $USER;
+ if (is_siteadmin()) {
+ return true;
+ }
if (!is_enrolled($this->get_course_context(), $userid)) {
return false;
}
@@ -257,7 +257,7 @@ public function upgrade_assignment($oldassignmentid, & $log) {
} catch (Exception $exception) {
$rollback = true;
- $log .= get_string('conversionexception', 'mod_assign', $exception->error);
+ $log .= get_string('conversionexception', 'mod_assign', $exception->getMessage());
}
if ($rollback) {

0 comments on commit f3d4993

Please sign in to comment.