"MDL-14129, fix print_error"

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index a1aaa5aba0cec517ceb62fca894e28d226083275..f9d85fdeed614386e72bb355c98a614281106f0d 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -71,6 +71,7 @@ $string['cannotfindlang'] = 'Cannot find \"$a\" language pack!';
 $string['cannotfindsite'] = 'Cannot find site-level course';
 $string['cannotfindteacher'] = 'Cannot find teacher.';
 $string['cannotfinduser'] = 'Cannot find user named \"$a\"';
+$string['cannotimport'] = 'Import error';
 $string['cannotimportgrade'] = 'Grade import error';
 $string['cannotimportformat'] = 'Sorry, importing this format is not yet implemented!';
 $string['cannotnetgeo'] = 'Can not connect to NetGeo server at http://netgeo.caida.org, please check proxy settings or better install MaxMind GeoLite City data file.';

diff --git a/question/import.php b/question/import.php
index b735f4101309f760048e82f0d773c680240c4663..619b9f2adb1dbc66558e4d7f0fffdad18bb4239c 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -131,12 +131,14 @@
 
             // Do anything before that we need to
             if (! $qformat->importpreprocess()) {
-                print_error($txt->importerror, '', $thispageurl->out());
+                //TODO: need more detailed error info
+                print_error('cannotimport', '', $thispageurl->out());
             }
 
             // Process the uploaded file
             if (! $qformat->importprocess()) {
-                print_error($txt->importerror, '', $thispageurl->out());
+                //TODO: need more detailed error info
+                print_error('cannotimport', '', $thispageurl->out());
             }
 
             // In case anything needs to be done after