From 12fa1e648113ed689700bb0a979d4a5b8e618b89 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Aug 2015 18:14:38 -0400 Subject: [PATCH] Incorrect scalar type declaration (reported under PHP 7) Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/Util.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 853b07b9df..e58ea8dd8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.4.14.0 (not yet released) - issue #11367 Export after search, missing WHERE clause - issue #11380 Incomplete message after import +- issue Incorrect scalar type declaration (reported under PHP 7) 4.4.13.1 (2015-08-08) - issue #11368 SQL error when importing phpMyAdmin dump file diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 189f6d35d8..e8e4bc7d45 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4234,7 +4234,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']);