diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-03 01:01:36 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-03-04 06:59:00 +0300 |
| commit | a65546f4809d3a76f221f2668bf47342666ba7c2 (patch) | |
| tree | 35e316055235728ae76c87a9f8873bdf09be1867 /plugins | |
| parent | 87675a98c5b3a4cc89dde61e933364ddf958b55f (diff) | |
Update the system check to consider https over fopen too
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreUpdater/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/Installation/lang/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index ca72b62ac0..a1e5aaae78 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -433,6 +433,6 @@ class Controller extends \Piwik\Plugin\Controller return false; } - return Http::getTransportMethod() === 'curl'; + return Http::getTransportMethod() !== 'socket'; } } diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json index 57abb9c4cf..a5ab1c613d 100644 --- a/plugins/Installation/lang/en.json +++ b/plugins/Installation/lang/en.json @@ -116,7 +116,7 @@ "SystemCheckCronArchiveProcessCLI": "Managing processes via CLI", "SystemCheckPhpSetting": "To prevent some critical issue, you must set the following in your php.ini file: %s", "SystemCheckUpdateHttps": "Update over HTTPS", - "SystemCheckUpdateHttpsNotSupported": "Piwik will update without using HTTPS which is insecure. Check that CURL is installed.", + "SystemCheckUpdateHttpsNotSupported": "Piwik cannot use HTTPS to update, it will fall back to the insecure HTTP update. Check that CURL or allow_url_fopen is supported.", "NotSupported": "not supported", "Tables": "Creating the Tables", "TablesCreatedSuccess": "Tables created with success!", |