aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-01-09 19:09:20 +0100
committerM. Dent <dentm42@gmail.com>2019-01-09 19:09:20 +0100
commitb22caef65fe2d87d702592bd0ecb057d21c168dd (patch)
treee7c03427486d012a2996ae21b25070eeafca74c4 /vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
parentdb4281164cf788eece76771bf69f08d7926600f2 (diff)
parentdbd230da7407ac70483c004bc82f4b8619c42760 (diff)
downloadvolse-hubzilla-b22caef65fe2d87d702592bd0ecb057d21c168dd.tar.gz
volse-hubzilla-b22caef65fe2d87d702592bd0ecb057d21c168dd.tar.bz2
volse-hubzilla-b22caef65fe2d87d702592bd0ecb057d21c168dd.zip
Merge branch 'composer_updates' into 'dev'
update composer libs See merge request hubzilla/core!1455
Diffstat (limited to 'vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php')
-rw-r--r--vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
index c96cb972f..f547bf6e8 100644
--- a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
@@ -64,7 +64,12 @@ class Request implements RequestInterface
$this->files = $files;
$this->server = $server;
$this->content = $content;
- $this->headers = is_null($headers) ? $this->getHeadersFromServer($this->server) : $headers;
+
+ if ($headers === null) {
+ $headers = array();
+ }
+
+ $this->headers = $headers + $this->getHeadersFromServer($this->server);
}
/**