Remove type annotation
It seems to be broken on some PHP versions: Argument 1 passed to PMA_Util::configureCurl() must be an instance of resource, resource given, called in libraries/Config.class.php on line 774 and defined Seen this on my workstation with PHP 5.6.1 and Google shows some hits of this as well. Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
parent
67c858265d
commit
52ea1026ad
@ -4474,7 +4474,7 @@ class PMA_Util
|
||||
*
|
||||
* @return resource curl_handle with updated options
|
||||
*/
|
||||
public static function configureCurl(resource $curl_handle)
|
||||
public static function configureCurl($curl_handle)
|
||||
{
|
||||
if (/*overload*/mb_strlen($GLOBALS['cfg']['ProxyUrl'])) {
|
||||
curl_setopt($curl_handle, CURLOPT_PROXY, $GLOBALS['cfg']['ProxyUrl']);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user