From 163c850c837226985e324d4a519dd6b9e2ad033c Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 27 Jan 2015 20:22:13 +0000 Subject: fixes #7083 make sure curl_exec exists as well as it could be disabled but is needed --- core/Http.php | 2 +- libs/PiwikTracker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Http.php b/core/Http.php index 2fa5bd3937..25d6d59566 100644 --- a/core/Http.php +++ b/core/Http.php @@ -47,7 +47,7 @@ class Http protected static function isCurlEnabled() { - return function_exists('curl_init'); + return function_exists('curl_init') && function_exists('curl_exec'); } /** diff --git a/libs/PiwikTracker b/libs/PiwikTracker index 84a994a4d3..be8e96bdfc 160000 --- a/libs/PiwikTracker +++ b/libs/PiwikTracker @@ -1 +1 @@ -Subproject commit 84a994a4d34a601a1b1da2c44a122807a1c4ad5b +Subproject commit be8e96bdfcbc6360729de449b4a9d2c93d997919 -- cgit v1.2.3