From 535a6fa0b571feca78d0b940fffc80d109ccb351 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Sun, 15 Jun 2008 11:34:42 +0000
Subject: [PATCH] "MDL-14129, fix print_error"

---
 course/mod.php         | 2 +-
 course/modedit.php     | 6 ++++--
 lang/en_utf8/error.php | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/course/mod.php b/course/mod.php
index 3e13e9fc94..1c1765972c 100644
--- 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 f171fd609d..69ec751822 100644
--- 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 da406c6717..a38bc33181 100644
--- 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';
-- 
2.39.5