"MDL-14129, fix print_error"

diff --git a/course/mod.php b/course/mod.php
index 3e13e9fc947963e8d2e92f533e87484a43c72e23..1c1765972c29eb82d5d76db833b0bff73027b4da 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -276,7 +276,7 @@ function get_cm($id, $error='cmunknown') {
     if (!$modname = $DB->get_field_sql("SELECT md.name
                                           FROM {course_modules} cm, {modules} md
                                          WHERE cm.id = ? AND md.id = cm.module", array($id))){
-        print_error($error);
+        print_error('cmunknown');
     }
 
     $cm = get_coursemodule_from_id($modname, $id);

diff --git a/course/modedit.php b/course/modedit.php
index f171fd609d8e8570b2980988928d022130645b61..69ec751822c78dd2f4bd15fc9f3bb83ffb528d68 100644 (file)
--- a/course/modedit.php
+++ b/course/modedit.php
@@ -248,7 +248,8 @@
                 print_error('cannotupdatemod', '', 'view.php?id=$course->id', $fromform->modulename);
             }
             if (is_string($returnfromfunc)) {
-                print_error($returnfromfunc, '', "view.php?id=$course->id");
+                //TODO: need more detailed error info
+                print_error('invalidfunction', '', 'view.php?id=$course->id');
             }
 
             set_coursemodule_visible($fromform->coursemodule, $fromform->visible);
@@ -283,7 +284,8 @@
                 print_error("cannotaddnewmodule", '', "view.php?id=$course->id", $fromform->modulename);
             }
             if (is_string($returnfromfunc)) {
-                print_error($returnfromfunc, '', "view.php?id=$course->id");
+                //TODO: need more detailed error info
+                print_error('invalidfunction', '', 'view.php?id=$course->id');
             }
 
             $fromform->instance = $returnfromfunc;

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index da406c67177ca5493e858946720c8457a04fe0a8..a38bc3318187a3a355250633f4316e0081d1a7d2 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -236,6 +236,7 @@ $string['invalidfieldname'] = '\"$a\" is not a valid field name';
 $string['invalidfiletype'] = '\"$a\" is not a valid file type';
 $string['invalidformatpara'] = 'Incorrect format for choose parameter';
 $string['invalidformdata'] = 'Incorrect Form Data';
+$string['invalidfunction'] = 'Incorrect function';
 $string['invalidgradeitmeid'] = 'Incorrect grade item id';
 $string['invalidgroupid'] = 'Incorrect group id specified.';
 $string['invaliditemid'] = 'Incorect item id';