Skip to content

Commit b172138

Browse files
committed
Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-07-16
2 parents 763db2d + 0939357 commit b172138

File tree

78 files changed

+17398
-222
lines changed

Some content is hidden

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

78 files changed

+17398
-222
lines changed

.drone.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ steps:
3434
- name: phpstan
3535
image: joomlaprojects/docker-images:php8.2
3636
depends_on: [ phpcs ]
37-
failure: ignore
3837
commands:
3938
- ./libraries/vendor/bin/phpstan
4039

@@ -415,6 +414,6 @@ trigger:
415414

416415
---
417416
kind: signature
418-
hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae
417+
hmac: e7e97cddd98bd4db561056d6eb59c5eea2ae3fd55e20870bf800beaa773fbf6b
419418

420419
...

.github/workflows/ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
108108
- name: Run PHPstan
109109
run: |
110-
./libraries/vendor/bin/phpstan --error-format=github || :
110+
./libraries/vendor/bin/phpstan --error-format=github
111111
112112
tests-unit:
113113
name: Run Unit tests
@@ -264,3 +264,14 @@ jobs:
264264
POSTGRES_USER: root
265265
POSTGRES_PASSWORD: joomla_ut
266266
POSTGRES_DB: test_joomla
267+
268+
typos:
269+
name: Check for typos
270+
runs-on: ubuntu-latest
271+
steps:
272+
- name: Checkout Actions Repository
273+
uses: actions/checkout@v4
274+
- name: Spell Check Repository
275+
uses: crate-ci/[email protected]
276+
with:
277+
config: .github/workflows/typos.toml

.github/workflows/typos.toml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Custom configuration file for the typos action
2+
# Excludes some folders with non-english language content
3+
# Excludes certain words as false-positives - mainly in js or
4+
# that can't be changed for b/c
5+
6+
[files]
7+
extend-exclude = [
8+
"/templates/system/*.html",
9+
"/administrator/components/com_admin/sql/*",
10+
"/build/media_source/vendor/tinymce/langs/*",
11+
"/installation/language/*",
12+
"includes/*.html",
13+
"/plugins/sampledata/testing/*",
14+
]
15+
16+
[default.extend-words]
17+
accordian="accordian" # Not changed for B/C see #36821
18+
assigments="assigments" # Not changed for B/C see #36822
19+
ba="ba" # Used for filename for Bosnian flag
20+
cachable="cachable" # Not changed for B/C see #29808#discussion_r446681316
21+
cll="cll" # Mysql version name
22+
chck="chck" # Used in modal-content-select-field.es6.js
23+
childs="childs" # Used in config-filters.es6.js and language string
24+
cose="cose" # Webauthn COSE algorithm
25+
credate="credate" # Selector in queries
26+
cript="cript" # Used in regex for htaccess.txt and web.config.txt
27+
crypted="crypted" # Used in MD5Handler
28+
datas="datas" # Used in showon.es6.js
29+
deactive="deactive" # Used in searchtools.es6.js
30+
exept="exept" # Used in El.php Greek language stemmer
31+
fof="fof" # To be fixed - outdated code comment in com_postinstall
32+
Formater="Formater" # Used in AbstractDataCollector of debug plugin
33+
hel="hel" # Variable name in MenusHelper
34+
identicals="identicals" # administrator\components\com_templates\tmpl\template\default.php
35+
linke="linke" # name of com_content field
36+
occurence="occurence" # Used in plg_system_debug\widgets\languageStrings\widget.es5.js
37+
ot="ot" # Valid use as OTP and Livelap[bB]ot
38+
Querys="Querys" # $backupExtraQuerys in administrator\components\com_installer\src\Model\UpdatesitesModel.php
39+
shepard="shepard" # CSS filename reference to upstream library
40+
supercedes="supercedes" # Valid spelling rejected https://github.com/crate-ci/typos/issues/1325
41+
ue="ue" # selector in queries
42+
vertexes="vertexes" # Valid spelling waiting fix https://github.com/crate-ci/typos/issues/1150
43+
wheres="wheres" # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php
44+
45+
# deprecated strings can be removed in 6.0
46+
configurated="configurated"
47+
discernable="discernable"
48+
hilight="hilight"
49+
mis="mis"

administrator/components/com_finder/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<field
235235
name="highlight_terms"
236236
type="radio"
237-
label="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL"
237+
label="COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL"
238238
description="COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC"
239239
layout="joomla.form.field.radio.switcher"
240240
default="1"

administrator/components/com_joomlaupdate/config.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,5 @@
121121
class="alert alert-info w-100"
122122
showon="updatesource!:default[OR]minimum_stability!:4"
123123
/>
124-
<field
125-
name="automated_updates_email"
126-
type="text"
127-
label="COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_LABEL"
128-
description="COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION"
129-
showon="updatesource:default[AND]minimum_stability:4[AND]autoupdate:1"
130-
/>
131124
</fieldset>
132125
</config>

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,8 @@ public function sendNotification($type, $oldVersion): void
4848
{
4949
$params = ComponentHelper::getParams('com_joomlaupdate');
5050

51-
// Load the parameters.
52-
$specificEmail = $params->get('automated_updates_email');
53-
54-
// Let's find out the email addresses to notify
55-
$superUsers = [];
56-
57-
if (!empty($specificEmail)) {
58-
$superUsers = $this->getSuperUsers($specificEmail);
59-
}
60-
61-
if (empty($superUsers)) {
62-
$superUsers = $this->getSuperUsers();
63-
}
51+
// Send a notification to all super users
52+
$superUsers = $this->getSuperUsers();
6453

6554
if (empty($superUsers)) {
6655
throw new \RuntimeException();

administrator/language/en-GB/com_finder.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ COM_FINDER_CONFIG_FILTER_COMMONWORDS_LABEL="Filter Common Words"
1818
COM_FINDER_CONFIG_FILTER_NUMERICS_LABEL="Filter Numeric Terms"
1919
COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
2020
COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC="For performance reasons, this will not highlight more than 10 different terms in the search results."
21+
COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
22+
; deprecated will be removed in 6.0
2123
COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
2224
COM_FINDER_CONFIG_IMAGE_CLASS_LABEL="Image Class"
2325
COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DEFAULT_LANGUAGE="Default Site Language"

administrator/language/en-GB/com_joomlaupdate.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DISABLED_LABEL="<span class=\"fa-fw me
1616
COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_LABEL="Automated Updates"
1717
COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_DESC="Automatically update Joomla to the latest version when it is available."
1818
COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_LABEL="Automated Update"
19-
COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
20-
COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_LABEL="Super User Emails"
2119
COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_DESC="Shows the checkbox to confirm you have taken a backup and you're ready to update in the final step before the update is actually applied."
2220
COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_LABEL="Confirm Backup Checkbox"
2321
COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL="Custom URL"
Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
; Joomla! Project
2-
; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
3-
; License GNU General Public License version 2 or later; see LICENSE.txt
4-
; Note : All ini files need to be saved as UTF-8
5-
6-
PLG_SYSTEM_SCHEMAORG="System - Schema.org"
7-
PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION="Choose whether your website represents an organization or a single person."
8-
PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
9-
PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
10-
PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
11-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
12-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
13-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
14-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."
15-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_LABEL="Schema"
16-
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL="Schema Type"
17-
PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL="Image"
18-
PLG_SYSTEM_SCHEMAORG_NAME_LABEL="Name"
19-
PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL="Social Media Accounts"
20-
PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL="URL"
21-
PLG_SYSTEM_SCHEMAORG_USER_LABEL="Select User"
22-
PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."
1+
; Joomla! Project
2+
; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
3+
; License GNU General Public License version 2 or later; see LICENSE.txt
4+
; Note : All ini files need to be saved as UTF-8
5+
6+
PLG_SYSTEM_SCHEMAORG="System - Schema.org"
7+
PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION="Choose whether your website represents an organization or a single person."
8+
PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
9+
PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
10+
PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
11+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
12+
; The following two strings are deprecated and will be removed with 6.0
13+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
14+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
15+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
16+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
17+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."
18+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_LABEL="Schema"
19+
PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL="Schema Type"
20+
PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL="Image"
21+
PLG_SYSTEM_SCHEMAORG_NAME_LABEL="Name"
22+
PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL="Social Media Accounts"
23+
PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL="URL"
24+
PLG_SYSTEM_SCHEMAORG_USER_LABEL="Select User"
25+
PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."

administrator/modules/mod_menu/mod_menu.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)