Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.816
diff -u -9 -p -r1.816 common.inc
--- includes/common.inc	5 Nov 2008 17:06:18 -0000	1.816
+++ includes/common.inc	5 Nov 2008 21:24:15 -0000
@@ -676,19 +676,19 @@ function _drupal_log_error($type, $messa
     unset($GLOBALS['theme']);
     if (!defined('MAINTENANCE_MODE')) {
       define('MAINTENANCE_MODE', 'error');
     }
     drupal_maintenance_theme();
   }
 
   // When running inside the testing framework, we relay the errors
   // to the tested site by the way of HTTP headers.
-  if (preg_match("/^simpletest\d+/", $GLOBALS['db_prefix']) && !headers_sent() && !defined('SIMPLETEST_DONT_COLLECT_ERRORS')) {
+  if (preg_match("/^simpletest\d+/", $_SERVER['HTTP_USER_AGENT']) && !headers_sent() && !defined('SIMPLETEST_DONT_COLLECT_ERRORS')) {
     static $number = 0;
     $assertion = array(
       $message,
       $type,
       $caller
     );
     header('X-Drupal-Assertion-' . $number . ': ' . rawurlencode(serialize($assertion)));
     $number++;
   }