diff --git a/cake/dispatcher.php b/cake/dispatcher.php index c6be13c7de5..f09e1099702 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -515,7 +515,7 @@ function uri() { if (key($_GET) && strpos(key($_GET), '?') !== false) { unset($_GET[key($_GET)]); } - $uri = preg_split('/\?/', $uri, 2); + $uri = explode('?', $uri, 2); if (isset($uri[1])) { parse_str($uri[1], $_GET); diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index d0bf021df71..da8bd0268d4 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -854,7 +854,7 @@ function parseCookies($header) { foreach ((array)$header['Set-Cookie'] as $cookie) { if (strpos($cookie, '";"') !== false) { $cookie = str_replace('";"', "{__cookie_replace__}", $cookie); - $parts = str_replace("{__cookie_replace__}", '";"', preg_split('/\;/', $cookie)); + $parts = str_replace("{__cookie_replace__}", '";"', explode(';', $cookie)); } else { $parts = preg_split('/\;[ \t]*/', $cookie); }