diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-06-17 13:40:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-06-17 13:40:26 +0000 |
| commit | b65538567d30138db7c91b5d92717a0e2cb0a240 (patch) | |
| tree | 24b6835894edf9aefa9261a35a768b7b8015bf70 | |
| parent | 1a089351e0f7b8a51399f5eded059beae0ae0b7b (diff) | |
| download | brdo-b65538567d30138db7c91b5d92717a0e2cb0a240.tar.gz brdo-b65538567d30138db7c91b5d92717a0e2cb0a240.tar.bz2 | |
- Patch #276008 by lilou, Arancaytar: missing user agent should not trigger a notice per the HTTP specification.
| -rw-r--r-- | includes/database/database.inc | 2 | ||||
| -rw-r--r-- | modules/simpletest/simpletest.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index f1185c77a..20b8ba5b5 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -1358,7 +1358,7 @@ abstract class Database { // We need to pass around the simpletest database prefix in the request // and we put that in the user_agent header. - if (preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) { + if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^simpletest\d+$/", $_SERVER['HTTP_USER_AGENT'])) { $db_prefix .= $_SERVER['HTTP_USER_AGENT']; } return $new_connection; diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 45d2d15b4..a26dce0d4 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -260,7 +260,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { * @return The test is being run from inside a CURL request. */ function inCURL() { - return preg_match("/^simpletest\d+/", $_SERVER['HTTP_USER_AGENT']); + return isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/^simpletest\d+/", $_SERVER['HTTP_USER_AGENT']); } } |