MDL-19163 restore - avoid some notices. Merged from 19_STABLE

diff --git a/backup/restore_check.html b/backup/restore_check.html
index 722e85e1ec66a5695a011507f3ef9f5451360373..63b19179a19dab35725ba122b785db1f95795f23 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -22,8 +22,8 @@
 
     if ($form1 = data_submitted()) {
         $currentcourseshortname = $course_header->course_shortname; //"store_ShortName";
-        $course_header->course_shortname =  $form1->shortname;  //"update_ShortName";
-        $course_header->course_fullname =   $form1->fullname;   //"update_FullName";
+        $course_header->course_shortname = !empty($form1->shortname) ? $form1->shortname : '';  //"update_ShortName";
+        $course_header->course_fullname  = !empty($form1->fullname) ? $form1->fullname : '';   //"update_FullName";
     /// Roll dates only if the backup course has a start date
     /// (some formats like main page, social..., haven't it and rolling dates
     /// from 0 produces crazy dates. MDL-10125 and we have passed some custom startyear/month/day. MDL-12922