summaryrefslogtreecommitdiff
path: root/includes/database/database.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/database/database.inc')
-rw-r--r--includes/database/database.inc3
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;
}