Merge branch '3.2' into 3.3

This commit is contained in:
Daniel Hensby 2016-09-07 09:21:21 +01:00
commit b80dc6450a
No known key found for this signature in database
GPG Key ID: 229831A941962E26

View File

@ -302,7 +302,7 @@ class HTTP {
}
public static function register_etag($etag) {
if (0 !== strpos('"')) {
if (0 !== strpos($etag, '"')) {
$etag = sprintf('"%s"', $etag);
}
self::$etag = $etag;