fixed legacy comment upgrade code in assignment and journal

diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index 9ecd055d2a904a592674b72af5b45e4ca62de9c8..4cc0412cf7659461504da5dfe759d9181b609fc5 100644 (file)
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -149,7 +149,7 @@
             $submission->data1 = backup_todb($sub_info['#']['DATA1']['0']['#']);
             $submission->data2 = backup_todb($sub_info['#']['DATA2']['0']['#']);
             $submission->grade = backup_todb($sub_info['#']['GRADE']['0']['#']);
-            if (isset(backup_todb($sub_info['#']['COMMENT']['0']['#']))) {
+            if (isset($sub_info['#']['COMMENT']['0']['#'])) {
                 $submission->submissioncomment = backup_todb($sub_info['#']['COMMENT']['0']['#']);
             } else {
                 $submission->submissioncomment = backup_todb($sub_info['#']['SUBMISSIONCOMMENT']['0']['#']);

diff --git a/mod/journal/restorelib.php b/mod/journal/restorelib.php
index a3e082f2d1fd9c89dd951f9c7e17845a5f0cb708..0849e0190b7496c04c99392b981d5f004bf4908c 100644 (file)
--- a/mod/journal/restorelib.php
+++ b/mod/journal/restorelib.php
@@ -132,7 +132,7 @@
             $entry->text = backup_todb($entry_info['#']['TEXT']['0']['#']);
             $entry->format = backup_todb($entry_info['#']['FORMAT']['0']['#']);
             $entry->rating = backup_todb($entry_info['#']['RATING']['0']['#']);
-            if (isset(backup_todb($entry_info['#']['COMMENT']['0']['#']))) {
+            if (isset($entry_info['#']['COMMENT']['0']['#'])) {
                 $entry->entrycomment = backup_todb($entry_info['#']['COMMENT']['0']['#']);
             } else {
                 $entry->entrycomment = backup_todb($entry_info['#']['ENTRYCOMMENT']['0']['#']);