From 585385278cddd93282c83fdf093b52074074a987 Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 25 Feb 2008 14:05:06 +0000 Subject: [PATCH] MDL-13483 found two more native php mail() commands; merged from MOODLE_19_STABLE --- lib/datalib.php | 4 +++- lib/setup.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index 15363503d0..b4598e201a 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -1890,7 +1890,9 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user // email_to_user is not usable because email_to_user tries to write to the logs table, and this will get caught // in an infinite loop, if disk is full - mail($CFG->supportemail, $subject, $message); + if (empty($CFG->noemailever)) { + mail($CFG->supportemail, $subject, $message); + } } if (!$result and debugging()) { diff --git a/lib/setup.php b/lib/setup.php index 1dbc9f90ea..6b0a2c8d02 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -155,7 +155,7 @@ global $HTTPSPAGEREQUIRED; echo ''; echo ''; - if (!empty($CFG->emailconnectionerrorsto)) { + if (empty($CFG->noemailever) and !empty($CFG->emailconnectionerrorsto)) { mail($CFG->emailconnectionerrorsto, 'WARNING: Database connection error: '.$CFG->wwwroot, 'Connection error: '.$CFG->wwwroot); -- 2.39.5