From 437c1c5050e1d90837d22e12dd0616eff2b092c8 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Tue, 8 Apr 2008 01:51:00 +0000 Subject: [PATCH] MDL-14085, roll back some error() call --- admin/mnet/peers.php | 4 ++-- blocks/rss_client/block_rss_client_action.php | 16 ++++++++-------- course/import/groups/index.php | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php index 2448c6441b..3434f3b30c 100644 --- 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'].'
'; } - //error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&hostid='.$mnet_peer->id); - print_error("invalidpubkey", 'mnet', 'peers.php?step=update&hostid='.$mnet_peer->id, $errmsg); + error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&hostid='.$mnet_peer->id); + //print_error("invalidpubkey", 'mnet', 'peers.php?step=update&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 ad4c0d2668..b654a44152 100644 --- 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 e1e085fd95..9a41cc60a3 100755 --- 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); -- 2.39.5