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

…MOODLE_23_STABLE
moodle · Apr 10, 2013 · f3d4993 · f3d4993
2 parents b3e792b + 557383c
commit f3d4993
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.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;
         }

diff --git a/mod/assign/upgradelib.php b/mod/assign/upgradelib.php
@@ -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) {