Skip to content

Commit 2a63816

Browse files
committed
Merge branch '5.4-dev' into 6.0-dev-upmerge-2025-08-16
2 parents 019fc33 + 4c8ea6b commit 2a63816

File tree

70 files changed

+404
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+404
-213
lines changed

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@ public function prepareAutoUpdate(string $targetVersion): array
543543
throw new \Exception('Could not write update file', 410);
544544
}
545545

546+
Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $fileInformation['basename']), Log::INFO, 'Update');
547+
546548
$app = Factory::getApplication();
547549

548550
return [
@@ -1555,9 +1557,13 @@ private function getTargetMinimumPHPVersion()
15551557
{
15561558
$updateInformation = $this->getUpdateInformation();
15571559

1558-
return isset($updateInformation['object']->php_minimum) ?
1559-
$updateInformation['object']->php_minimum->_data :
1560-
JOOMLA_MINIMUM_PHP;
1560+
// Check if php_minimum exists and return its value
1561+
if (isset($updateInformation['object']) && $updateInformation['object']->get('php_minimum')) {
1562+
return $updateInformation['object']->get('php_minimum')->_data;
1563+
}
1564+
1565+
// Fallback to JOOMLA_MINIMUM_PHP if php_minimum is not set
1566+
return JOOMLA_MINIMUM_PHP;
15611567
}
15621568

15631569
/**

administrator/language/en-GB/com_joomlaupdate.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL="Starting installation of new version."
106106
COM_JOOMLAUPDATE_UPDATE_LOG_START="Update started by user %2$s (%1$s). Old version is %3$s."
107107
COM_JOOMLAUPDATE_UPDATE_LOG_UNINSTALL_EXTENSIONS="Uninstalling extensions"
108108
COM_JOOMLAUPDATE_UPDATE_LOG_UPLOAD="Uploading update file"
109-
COM_JOOMLAUPDATE_UPDATE_LOG_URL="Downloading update file from %s."
109+
COM_JOOMLAUPDATE_UPDATE_LOG_URL="Attempting to download update file from %s."
110110
COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_BODY="This email IS NOT sent by the Joomla! project. It is sent automatically by your own site,\n{SITENAME} - {URL} \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\nYour site has been successfully automatically updated from {OLDVERSION} to {NEWVERSION}.\nPlease check your site for any unexpected behavior or malfunctions.\nThis email is sent to you by your site.\nThe Joomla! project will never contact you directly.\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\nThis email has been automatically sent by Joomla!, the software which powers your site.\nYou have enabled automatic updates in your site and the installation of such an update triggers this message.\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\nThis email is sent to you by your own site, {SITENAME}"
111111
COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_SUBJECT="Joomla! updated successfully at {SITENAME} – {URL}"
112112
COM_JOOMLAUPDATE_UPDATING_COMPLETE="The update is finalising."

installation/language/af-ZA/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Afrikaans (Suid-Afrika)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Afrikaans Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/ar-AA/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Arabic (اللغة العربية)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Joomla! Project (Arabic Translation Team)</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/be-BY/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Belarusian (Belarus)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Joomla Belarus Community</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/bg-BG/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Bulgarian (bg-BG)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Joomla! Bulgaria</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/ca-ES/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Catalan (ca-ES)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Catalan [ca-ES] Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/cs-CZ/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Czech (Čeština)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Czech Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/cy-GB/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Welsh (United Kingdom)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Joomla! Project - Welsh Translation Team</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/da-DK/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<metafile client="installation">
33
<name>Danish (Danmark)</name>
44
<version>5.3.3</version>
5-
<creationDate>2025-07</creationDate>
5+
<creationDate>2025-08</creationDate>
66
<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
77
<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

0 commit comments

Comments
 (0)