MDL-14085, roll back some error() call

diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index 2448c6441baf353315edfba1f932dba6b220e4b8..3434f3b30c773396ee76098801dbdecff5e18349 100644 (file)
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -116,8 +116,8 @@ if (($form = data_submitted()) && confirm_sesskey()) {
                     foreach ($mnet_peer->error as $err) {
                         $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
                     }
-                    //error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&amp;hostid='.$mnet_peer->id);
-                    print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $errmsg);
+                    error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&amp;hostid='.$mnet_peer->id);
+                    //print_error("invalidpubkey", 'mnet', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $errmsg);
                     exit;
                 }
             }

diff --git a/blocks/rss_client/block_rss_client_action.php b/blocks/rss_client/block_rss_client_action.php
index ad4c0d26681ec186c9646e39fc15abc9dac3e326..b654a44152a671b3b2959cf2ae77beb61e95d1d2 100644 (file)
--- a/blocks/rss_client/block_rss_client_action.php
+++ b/blocks/rss_client/block_rss_client_action.php
@@ -99,10 +99,10 @@ if (isset($rss_record)) {
 if ($act == 'updfeed') {
 
     if (!$managefeeds) {
-        //print_error(get_string('noguestpost', 'forum').
-        //        ' You are not allowed to make modifications to this RSS feed at this time.',
-        //        $referrer);
-        print_error('noguestpost', 'forum', $referrer, 'You are not allowed to make modifications to this RSS feed at this time.');
+        error(get_string('noguestpost', 'forum').
+                ' You are not allowed to make modifications to this RSS feed at this time.',
+                $referrer);
+        //print_error('noguestpost', 'forum', $referrer, 'You are not allowed to make modifications to this RSS feed at this time.');
     }
 
 
@@ -223,10 +223,10 @@ if ($act == 'updfeed') {
 } else if ($act == 'delfeed') {
 
     if (!$managefeeds) {
-        //print_error(get_string('noguestpost', 'forum').
-        //        ' You are not allowed to make modifications to this RSS feed at this time.',
-        //        $referrer);
-        print_error('noguestpost', 'forum', $referrer, 'You are not allowed to make modifications to this RSS feed at this time.');
+        error(get_string('noguestpost', 'forum').
+                ' You are not allowed to make modifications to this RSS feed at this time.',
+                $referrer);
+        //print_error('noguestpost', 'forum', $referrer, 'You are not allowed to make modifications to this RSS feed at this time.');
     }
 
     $file = $CFG->dataroot .'/cache/rsscache/'. $rssid .'.xml';

diff --git a/course/import/groups/index.php b/course/import/groups/index.php
index e1e085fd950ed6ae6a17381154b8ccecec2929fb..9a41cc60a3cdc5c948a4302e538e41661d5a2c12 100755 (executable)
--- a/course/import/groups/index.php
+++ b/course/import/groups/index.php
@@ -121,11 +121,11 @@
                 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);
+                        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);
                     }
                     else if ($name == "groupname") {
                         $newgroup->name = addslashes($value);