From ffc1c105725e6cd53a048617c8236ed5a53e6c2b Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Wed, 14 May 2008 07:01:32 +0000
Subject: [PATCH] "MDL-14129, fix print_error"

---
 grade/edit/outcome/edit.php  | 6 +++---
 grade/edit/outcome/index.php | 2 +-
 lang/en_utf8/error.php       | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/grade/edit/outcome/edit.php b/grade/edit/outcome/edit.php
index f1c3aec280..e3443f6fbf 100644
--- a/grade/edit/outcome/edit.php
+++ b/grade/edit/outcome/edit.php
@@ -37,12 +37,12 @@ $systemcontext = get_context_instance(CONTEXT_SYSTEM);
 if ($id) {
     /// editing existing outcome
     if (!$outcome_rec = get_record('grade_outcomes', 'id', $id)) {
-        print_error('Incorrect outcome id');
+        print_error('invalidoutcome');
     }
     if ($outcome_rec->courseid) {
         $outcome_rec->standard = 0;
         if (!$course = get_record('course', 'id', $outcome_rec->courseid)) {
-            print_error('Incorrect course id');
+            print_error('invalidcourseid');
         }
         require_login($course);
         $context = get_context_instance(CONTEXT_COURSE, $course->id);
@@ -51,7 +51,7 @@ if ($id) {
     } else {
         if ($courseid) {
             if (!$course = get_record('course', 'id', $courseid)) {
-                print_error('Incorrect course id');
+                print_error('invalidcourseid');
             }
         }
         $outcome_rec->standard = 1;
diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 60bda49ec8..6a4190e649 100644
--- a/grade/edit/outcome/index.php
+++ b/grade/edit/outcome/index.php
@@ -92,7 +92,7 @@ switch ($action) {
         if (empty($outcome->courseid)) {
             require_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM));
         } else if ($outcome->courseid != $courseid) {
-            print_error('Incorrect courseid!');
+            print_error('invalidcourseid');
         }
 
         if (!$outcome->can_delete()) {
diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 254fc73678..bd5e12858e 100644
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -137,11 +137,13 @@ $string['invalidmd5'] = 'Invalid md5';
 $string['invalidmodule'] = 'Invalid module';
 $string['invalidmoduleid'] = 'Invalid module ID: $a';
 $string['invalidmodulename'] = 'Invalid module name: $a';
+$string['invalidoutcome'] = 'Incorrect outcome id';
 $string['invalidpagesize'] = 'Invalid page size';
 $string['invalidpaymentmethod'] = 'Invalid payment method: $a';
 $string['invalidrequest'] = 'Invalid request';
 $string['invalidrole'] = 'Invalid role';
 $string['invalidshortname'] = 'That\'s an invalid short course name';
+$string['invalidscaleid'] = 'Incorrect scale id';
 $string['invalidurl'] = 'Invalid url';
 $string['invaliduser'] = 'Invalid user';
 $string['invaliduserid'] = 'Invalid user id';
-- 
2.39.5