X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FExtension%2FDownloader.php;h=db85f4248ce96161ae61eae05dfc63087c79fc89;hb=9abd9c0a5b2fbc47a4591b9d6ce3498f74529021;hp=a76ca105e1c4debd3edd295410edbd52f243a499;hpb=101c87c3a34899044a256f5b612a874d0a42f236;p=civicrm-core.git diff --git a/CRM/Extension/Downloader.php b/CRM/Extension/Downloader.php index a76ca105e1..db85f4248c 100644 --- a/CRM/Extension/Downloader.php +++ b/CRM/Extension/Downloader.php @@ -71,18 +71,15 @@ class CRM_Extension_Downloader { ); } - if (empty($errors) && !CRM_Utils_HttpClient::singleton()->isRedirectSupported()) { - CRM_Core_Session::setStatus(ts('WARNING: The downloader may be unable to download files which require HTTP redirection. This may be a configuration issue with PHP\'s open_basedir or safe_mode.')); - Civi::log()->debug('WARNING: The downloader may be unable to download files which require HTTP redirection. This may be a configuration issue with PHP\'s open_basedir or safe_mode.'); - } - if ($extensionInfo) { $requiredExtensions = CRM_Extension_System::singleton()->getManager()->findInstallRequirements([$extensionInfo->key], $extensionInfo); foreach ($requiredExtensions as $extension) { if (CRM_Extension_System::singleton()->getManager()->getStatus($extension) !== CRM_Extension_Manager::STATUS_INSTALLED && $extension !== $extensionInfo->key) { + $requiredExtensionInfo = CRM_Extension_System::singleton()->getBrowser()->getExtension($extension); + $requiredExtensionInfoName = empty($requiredExtensionInfo->name) ? $extension : $requiredExtensionInfo->name; $errors[] = [ 'title' => ts('Missing Requirement: %1', [1 => $extension]), - 'message' => ts('You will not be able to install/upgrade %1 until you have installed the %2 extension.', [1 => $extensionInfo->key, 2 => $extension]), + 'message' => ts('You will not be able to install/upgrade %1 until you have installed the %2 extension.', [1 => $extensionInfo->name, 2 => $requiredExtensionInfoName]), ]; } }