diff options
author | zotlabs <mike@macgirvin.com> | 2017-03-15 17:44:21 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-03-15 17:44:21 -0700 |
commit | b20062efa6052e29b8d2d2a42ca966837db1c29f (patch) | |
tree | b3d1dd541319e2abb2af6ec62f2fa3003a9e3941 /vendor/sabre/http/lib/functions.php | |
parent | 14f16a7ef0ce1412fcccdabf6a44dd83efee9c60 (diff) | |
parent | 8d4744d115036dd7ec4169f8b1fdebebac6fb602 (diff) | |
download | volse-hubzilla-b20062efa6052e29b8d2d2a42ca966837db1c29f.tar.gz volse-hubzilla-b20062efa6052e29b8d2d2a42ca966837db1c29f.tar.bz2 volse-hubzilla-b20062efa6052e29b8d2d2a42ca966837db1c29f.zip |
Merge branch 'red' of https://github.com/zotlabs/hubzilla into red
Diffstat (limited to 'vendor/sabre/http/lib/functions.php')
-rw-r--r-- | vendor/sabre/http/lib/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/sabre/http/lib/functions.php b/vendor/sabre/http/lib/functions.php index 1ec123f2e..d94119623 100644 --- a/vendor/sabre/http/lib/functions.php +++ b/vendor/sabre/http/lib/functions.php @@ -79,7 +79,7 @@ function toDate(DateTime $dateTime) { // We need to clone it, as we don't want to affect the existing // DateTime. $dateTime = clone $dateTime; - $dateTime->setTimeZone(new \DateTimeZone('GMT')); + $dateTime->setTimezone(new \DateTimeZone('GMT')); return $dateTime->format('D, d M Y H:i:s \G\M\T'); } @@ -216,7 +216,7 @@ function negotiateContentType($acceptHeaderValue, array $availableOptions) { * Parameters are currently discarded. There's no known prefer value that * uses them. * - * @param string|string[] $header + * @param string|string[] $input * @return array */ function parsePrefer($input) { |