projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #12340 from eileenmcnaughton/merge_cleanup
[civicrm-core.git]
/
CRM
/
Utils
/
HttpClient.php
diff --git
a/CRM/Utils/HttpClient.php
b/CRM/Utils/HttpClient.php
index ee4cb5171fac1d8253821ac496e8158458512e61..f9e115686c45d5c4e086015fe7fda04cc1151f3b 100644
(file)
--- a/
CRM/Utils/HttpClient.php
+++ b/
CRM/Utils/HttpClient.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
5
|
+ | Copyright CiviCRM LLC (c) 2004-201
8
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-34,7
+34,7
@@
* want to deal with that so late in the 4.3 dev cycle.
*
* @package CRM
* want to deal with that so late in the 4.3 dev cycle.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
5
+ * @copyright CiviCRM LLC (c) 2004-201
8
*/
class CRM_Utils_HttpClient {
*/
class CRM_Utils_HttpClient {
@@
-92,17
+92,12
@@
class CRM_Utils_HttpClient {
$fp = @fopen($localFile, "w");
if (!$fp) {
$fp = @fopen($localFile, "w");
if (!$fp) {
- // Fixme: throw error instead of setting message
- CRM_Core_Session::setStatus(ts('Unable to write to %1.<br />Is the location writable?', array(1 => $localFile)), ts('Write Error'), 'error');
return self::STATUS_WRITE_ERROR;
}
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_exec($ch);
if (curl_errno($ch)) {
return self::STATUS_WRITE_ERROR;
}
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_exec($ch);
if (curl_errno($ch)) {
- // Fixme: throw error instead of setting message
- CRM_Core_Session::setStatus(ts('Unable to download extension from %1. Error Message: %2',
- array(1 => $remoteFile, 2 => curl_error($ch))), ts('Extension download error'), 'error');
return self::STATUS_DL_ERROR;
}
else {
return self::STATUS_DL_ERROR;
}
else {