Skip to content

Commit 8d98648

Browse files
committed
Update Request.php
1 parent a24f8fd commit 8d98648

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/Request.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public static function getParam($paramName) {
118118
if ($val === false) {
119119
return null;
120120
}
121+
return $val;
121122
}
122123
/**
123124
* Returns the IP address of the user who is connected to the server.
@@ -227,8 +228,10 @@ public static function getHeaders() {
227228
foreach ($headers as $k => $v) {
228229
self::get()->requestHeaders[strtolower($k)] = filter_var($v, FILTER_SANITIZE_STRING);
229230
}
230-
} else if (isset($_SERVER)) {
231-
self::get()->requestHeaders = self::_getRequestHeadersFromServer();
231+
}
232+
233+
if (isset($_SERVER)) {
234+
self::get()->requestHeaders = array_merge(self::get()->requestHeaders, self::_getRequestHeadersFromServer());
232235
}
233236
}
234237

0 commit comments

Comments
 (0)