mirror of
https://github.com/moodle/moodle.git
synced 2025-04-21 00:12:56 +02:00
Merge branch 'MDL-59572-master' of git://github.com/andrewnicols/moodle
This commit is contained in:
commit
9c0cdc069b
@ -594,19 +594,29 @@ abstract class moodle_database {
|
||||
return;
|
||||
}
|
||||
if (CLI_SCRIPT) {
|
||||
echo "--------------------------------\n";
|
||||
echo $sql."\n";
|
||||
$separator = "--------------------------------\n";
|
||||
echo $separator;
|
||||
echo "{$sql}\n";
|
||||
if (!is_null($params)) {
|
||||
echo "[".var_export($params, true)."]\n";
|
||||
echo "[" . var_export($params, true) . "]\n";
|
||||
}
|
||||
echo "--------------------------------\n";
|
||||
echo $separator;
|
||||
} else if (AJAX_SCRIPT) {
|
||||
$separator = "--------------------------------";
|
||||
error_log($separator);
|
||||
error_log($sql);
|
||||
if (!is_null($params)) {
|
||||
error_log("[" . var_export($params, true) . "]");
|
||||
}
|
||||
error_log($separator);
|
||||
} else {
|
||||
echo "<hr />\n";
|
||||
echo s($sql)."\n";
|
||||
$separator = "<hr />\n";
|
||||
echo $separator;
|
||||
echo s($sql) . "\n";
|
||||
if (!is_null($params)) {
|
||||
echo "[".s(var_export($params, true))."]\n";
|
||||
echo "[" . s(var_export($params, true)) . "]\n";
|
||||
}
|
||||
echo "<hr />\n";
|
||||
echo $separator;
|
||||
}
|
||||
}
|
||||
|
||||
@ -623,6 +633,9 @@ abstract class moodle_database {
|
||||
if (CLI_SCRIPT) {
|
||||
echo $message;
|
||||
echo "--------------------------------\n";
|
||||
} else if (AJAX_SCRIPT) {
|
||||
error_log($message);
|
||||
error_log("--------------------------------");
|
||||
} else {
|
||||
echo s($message);
|
||||
echo "<hr />\n";
|
||||
|
Loading…
x
Reference in New Issue
Block a user