espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

Browse Source
This commit is contained in:
yuri
2019-02-28 13:55:36 +02:00
parent 225704d1f7 94ee8c6491
commit 18736600ef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Upgrades/Actions/Base/Install.php
+1 -1
View File
@@ -119,7 +119,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
$this->deletePackageFiles();
if ($this->getManifestParam('skipBackup')) {
$this->getFileManager()->removeInDir($this->getPath('backupPath'), true);
$this->getFileManager()->removeInDir([$this->getPath('backupPath'), self::FILES]);
}
$GLOBALS['log']->debug('Installation process ['.$processId.']: end run.');
application/Espo/Services/AdminNotifications.php
+3 -3
View File
@@ -108,7 +108,6 @@ class AdminNotifications extends \Espo\Core\Services\Base
$extensionName = $row['name'];
$latestRelease = $this->getLatestRelease($url, [
'response' => 'latestRelease',
'name' => $extensionName,
]);
@@ -160,15 +159,16 @@ class AdminNotifications extends \Espo\Core\Services\Base
*
* @return array|null
*/
protected function getLatestRelease($url = null, array $requestData = ['response' => 'latestRelease'])
protected function getLatestRelease($url = null, array $requestData = [], $urlPath = 'release/latest')
{
if (function_exists('curl_version')) {
$ch = curl_init();
$requestUrl = $url ? trim($url) : base64_decode('aHR0cHM6Ly9zLmVzcG9jcm0uY29tLw==');
$requestUrl = (substr($requestUrl, -1) == '/') ? $requestUrl : $requestUrl . '/';
$requestUrl .= empty($requestData) ? $urlPath . '/' : $urlPath . '/?' . http_build_query($requestData);
curl_setopt($ch, CURLOPT_URL, $requestUrl . '?' . http_build_query($requestData));
curl_setopt($ch, CURLOPT_URL, $requestUrl);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);