Display a notice about going to restore a newer backup file.

Bug 1675
(http://moodle.org/bugs/bug.php?op=show&bugid=1675)
Merged from MOODLE_13_STABLE

diff --git a/backup/restore_precheck.html b/backup/restore_precheck.html
index 72cfa5d8a7373153ee710777e100104272b1a8b1..ba65a2c43bf012b046848eed6d91c70057a144b1 100644 (file)
--- a/backup/restore_precheck.html
+++ b/backup/restore_precheck.html
@@ -109,6 +109,16 @@
     echo "</tr></td>";
     echo "</table>";
 
+    //We compare Moodle's versions
+    if ($CFG->version < $info->backup_moodle_version && $status) {
+        $message->serverversion = $CFG->version;
+        $message->serverrelease = $CFG->release;
+        $message->backupversion = $info->backup_moodle_version;
+        $message->backuprelease = $info->backup_moodle_release;
+        print_simple_box(get_string('noticenewerbackup','',$message), "center", "70%", "$THEME->cellheading2", "20", "noticebox");
+
+    }
+
     //Now we print in other table, the backup and the course it contains info
     if ($info and $course_header and $status) {
         //First, the course info

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index c3c9e70137c573e15bab77667ace91c05f639653..27e7ab8cef2c9800128c5cea0f9f90e1b987cddf 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -719,6 +719,7 @@ $string['notifyloginfailuresmessagewithuser'] = ' with username ';
 $string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&chooselog=1&modid=site_errors.';
 $string['numattempts'] = '$a failed login attempt(s) ';
 $string['nothingnew'] = 'Nothing new since your last login';
+$string['noticenewerbackup'] = 'This backup file has been created with Moodle $a->backuprelease ($a->backupversion) and it\'s newer than your currently installed Moodle $a->serverrelease ($a->serverversion). This could cause some inconsistencies because backwards compatibility of backup files cannot be guarantied.';
 $string['notincluded'] = 'Not included';
 $string['notingroup'] = 'Sorry, but you need to be part of a group to see this activity.';
 $string['nousersmatching'] = 'No users matching \'$a\' were found';