Merge branch '4.2-dev' into replace_factory_getapplication_in_control…

…lers
joomla · Jun 23, 2022 · a8a1da8 · a8a1da8
2 parents 4fa4485 + 7f1b361
commit a8a1da8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -152,6 +152,14 @@ protected function getLanguages()
 		}
 
 		$updateSiteXML = simplexml_load_string($response->body);
+
+		if (!$updateSiteXML)
+		{
+			Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_RETRIEVE_XML', $updateSite), 'error');
+
+			return;
+		}
+
 		$languages     = array();
 		$search        = strtolower($this->getState('filter.search'));
 

diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
@@ -144,6 +144,7 @@ COM_INSTALLER_MSG_DISCOVER_NOEXTENSION="<strong>No extensions have been discover
 COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED="No extension selected."
 COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS="Cleared discovered extensions."
 COM_INSTALLER_MSG_ERROR_CANT_CONNECT_TO_UPDATESERVER="Can't connect to %s"
+COM_INSTALLER_MSG_ERROR_CANT_RETRIEVE_XML="Can't retrieve XML from %s"
 COM_INSTALLER_MSG_INSTALL_ENTER_A_URL="Please enter a URL"
 COM_INSTALLER_MSG_INSTALL_INVALID_URL="Invalid URL"
 COM_INSTALLER_MSG_INSTALL_INVALID_URL_SCHEME="Please enter a valid URL starting with http or https."