diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-03-29 23:17:15 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-03-29 23:17:15 +0000 |
| commit | f3c839634d25dad4cc9cf36a0c570633526682d0 (patch) | |
| tree | b36aa1bce8e47989ea97ae8e6b77ebfe0ebd9737 | |
| parent | b20618aa129e670ee8e9934acba071b7d890ce61 (diff) | |
| download | brdo-f3c839634d25dad4cc9cf36a0c570633526682d0.tar.gz brdo-f3c839634d25dad4cc9cf36a0c570633526682d0.tar.bz2 | |
- Patch #131419 by Chris Johnson: renamed the error handler to avoid conflicts with third-party applications.
| -rw-r--r-- | includes/common.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 37cf2f8f9..1c18f6d34 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -538,7 +538,7 @@ function drupal_http_request($url, $headers = array(), $method = 'GET', $data = * 0 = Log errors to database. * 1 = Log errors to database and to screen. */ -function error_handler($errno, $message, $filename, $line) { +function drupal_error_handler($errno, $message, $filename, $line) { // If the @ error suppression operator was used, error_reporting is temporarily set to 0 if (error_reporting() == 0) { return; @@ -1878,7 +1878,7 @@ function _drupal_bootstrap_full() { require_once './includes/image.inc'; require_once './includes/form.inc'; // Set the Drupal custom error handler. - set_error_handler('error_handler'); + set_error_handler('drupal_error_handler'); // Emit the correct charset HTTP header. drupal_set_header('Content-Type: text/html; charset=utf-8'); // Detect string handling method |