diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 08:08:37 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-07 08:08:37 +0000 |
| commit | b04816e0fe30dab62d27bbf3ff08a15a2a14a13a (patch) | |
| tree | 74d5a32e3d88b77af8578062061c10323234dacf /includes/database/database.inc | |
| parent | 7bc4ca4fdad9616ba1a9ff0b0a707562fd1b5b4f (diff) | |
| download | brdo-b04816e0fe30dab62d27bbf3ff08a15a2a14a13a.tar.gz brdo-b04816e0fe30dab62d27bbf3ff08a15a2a14a13a.tar.bz2 | |
#716394 by boombatower: SimpleTest should respect table prefixes.
Diffstat (limited to 'includes/database/database.inc')
| -rw-r--r-- | includes/database/database.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index b988c83eb..c74ae2254 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -1540,7 +1540,8 @@ abstract class Database { // and we put that in the user_agent header. The header HMAC was already // validated in bootstrap.inc. if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^(simpletest\d+);/", $_SERVER['HTTP_USER_AGENT'], $matches)) { - $db_prefix .= $matches[1]; + $db_prefix_string = is_array($db_prefix) ? $db_prefix['default'] : $db_prefix; + $db_prefix = $db_prefix_string . $matches[1]; } return $new_connection; } |