MDL-14129, remove 2 error()s in course and blog module

diff --git a/blog/index.php b/blog/index.php
index da23b2feaa7ea1d24b07a8962728ac863b297905..565d1ca8996f41c1622b89f3e0c60cffa6b967e4 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -43,7 +43,7 @@ if (empty($filtertype)) {
         if ($postid) {
             $filtertype = 'user';
             if (!$postobject = $DB->get_record('post', array('module'=>'blog', 'id'=>$postid))) {
-                error('No such blog entry');
+                print_error('nosuchentry', 'blog');
             }
             $filterselect = $postobject->userid;
         } else {

diff --git a/course/import/groups/index.php b/course/import/groups/index.php
index 732052c94c00beb2e6d1877259b530d0ede0fb89..b8f1ac2ce7f686c20939671bf354b0cab816b128 100755 (executable)
--- a/course/import/groups/index.php
+++ b/course/import/groups/index.php
@@ -121,11 +121,7 @@
                 foreach ($record as $name => $value) {
                     // check for required values
                     if (isset($required[$name]) and !$value) {
-                        error(get_string('missingfield', 'error', $name). " ".
-                              get_string('erroronline', 'error', $linenum) .". ".
-                              get_string('processingstops', 'error'),
-                              'uploaduser.php?sesskey='.$USER->sesskey);
-                        //print_error('missingfield', 'error', 'uploaduser.php?sesskey='.$USER->sesskey, $name);
+                        print_error('missingfield', 'error', 'uploaduser.php?sesskey='.$USER->sesskey, $name);
                     }
                     else if ($name == "groupname") {
                         $newgroup->name = $value;

diff --git a/lang/en_utf8/blog.php b/lang/en_utf8/blog.php
index 2e2d30154d65cf2a2f14b6991faebf53ef9a00ae..1e4cdc0278c22e6bd576212b45ccfa0534a0f86e 100755 (executable)
--- a/lang/en_utf8/blog.php
+++ b/lang/en_utf8/blog.php
@@ -38,6 +38,7 @@ $string['groupblogs'] = 'Users can only see blogs for people who share a group';
 $string['intro'] = 'This RSS feed was automatically generated from one or more blogs.';
 $string['incorrectblogfilter'] = 'Incorrect blog filter type specified';
 $string['noentriesyet'] = 'No visible entries here';
+$string['nosuchentry'] = 'No such blog entry';
 $string['noguestpost'] = 'Guest can not post blogs!';
 $string['norighttodeletetag'] = 'You have no rights to delete this tag - $a';
 $string['notallowedtoedit'] = 'You are not allowed to edit this entry';