diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-10-25 00:06:19 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-10-25 00:06:19 +0000 |
| commit | bcc0741b67e83ad5a5da49e145fb3035b435584e (patch) | |
| tree | aeb6727eace4f3a671ed6718eb6b45b231860659 /includes | |
| parent | 2079d300b43e597d5f532caa4deef1111856a31d (diff) | |
| download | brdo-bcc0741b67e83ad5a5da49e145fb3035b435584e.tar.gz brdo-bcc0741b67e83ad5a5da49e145fb3035b435584e.tar.bz2 | |
- Patch #951486 by Damien Tournoud: invalid placeholders in exception messages during update.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 3 | ||||
| -rw-r--r-- | includes/update.inc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6a9d3a071..6f695814a 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1561,7 +1561,8 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia // Use a default value if $message is not set. if (empty($message)) { - $message = '%type: %message in %function (line %line of %file).'; + // The exception message is run through check_plain() by _drupal_decode_exception(). + $message = '%type: !message in %function (line %line of %file).'; } // $variables must be an array so that we can add the exception information. if (!is_array($variables)) { diff --git a/includes/update.inc b/includes/update.inc index d1993e0c3..d2ba9c1a6 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -883,7 +883,8 @@ function update_do_one($module, $number, $dependency_map, &$context) { require_once DRUPAL_ROOT . '/includes/errors.inc'; $variables = _drupal_decode_exception($e); - $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: %message in %function (line %line of %file).', $variables)); + // The exception message is run through check_plain() by _drupal_decode_exception(). + $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables)); } } |