Merge pull request #7248 from nupplaphil/bugs/6916-fatal-network
Fixing Network::post() caused by wrong argument
This commit is contained in:
commit
7761017915
|
@ -209,7 +209,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
|
|||
*
|
||||
*/
|
||||
|
||||
$res = Network::post($dfrn_confirm, $params, null, 120)->getBody();
|
||||
$res = Network::post($dfrn_confirm, $params, [], 120)->getBody();
|
||||
|
||||
Logger::log(' Confirm: received data: ' . $res, Logger::DATA);
|
||||
|
||||
|
|
|
@ -250,7 +250,7 @@ class Network
|
|||
* @return CurlResult The content
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function post(string $url, $params, $headers = null, int $timeout = 0, int &$redirects = 0)
|
||||
public static function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0)
|
||||
{
|
||||
$stamp1 = microtime(true);
|
||||
|
||||
|
@ -286,7 +286,7 @@ class Network
|
|||
}
|
||||
|
||||
if (defined('LIGHTTPD')) {
|
||||
if (!is_array($headers)) {
|
||||
if (empty($headers)) {
|
||||
$headers = ['Expect:'];
|
||||
} else {
|
||||
if (!in_array('Expect:', $headers)) {
|
||||
|
@ -295,7 +295,7 @@ class Network
|
|||
}
|
||||
}
|
||||
|
||||
if ($headers) {
|
||||
if (!empty($headers)) {
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue