#951116: fix exception messages in update.php and elsewhere.

From: Damien Tournoud <damien@commerceguys.com>


---
 bootstrap.inc                       |    2 +-
 update.inc                          |    2 +-
 simpletest/drupal_web_test_case.php |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git includes/bootstrap.inc includes/bootstrap.inc
index 2a80b06..60cc157 100644
--- includes/bootstrap.inc
+++ includes/bootstrap.inc
@@ -1561,7 +1561,7 @@ 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).';
+     $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 includes/update.inc includes/update.inc
index 3722c54..38eb72f 100644
--- includes/update.inc
+++ includes/update.inc
@@ -883,7 +883,7 @@ 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));
+      $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables));
     }
   }
 
diff --git modules/simpletest/drupal_web_test_case.php modules/simpletest/drupal_web_test_case.php
index 76c0248..d33d74d 100644
--- modules/simpletest/drupal_web_test_case.php
+++ modules/simpletest/drupal_web_test_case.php
@@ -517,7 +517,7 @@ abstract class DrupalTestCase {
       'file' => $exception->getFile(),
     ));
     require_once DRUPAL_ROOT . '/includes/errors.inc';
-    $this->error(t('%type: %message in %function (line %line of %file).', _drupal_decode_exception($exception)), 'Uncaught exception', _drupal_get_last_caller($backtrace));
+    $this->error(t('%type: !message in %function (line %line of %file).', _drupal_decode_exception($exception)), 'Uncaught exception', _drupal_get_last_caller($backtrace));
   }
 
   /**