Skip to content

Commit 447c628

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
# Conflicts: # .drone.yml # administrator/language/en-GB/install.xml # administrator/language/en-GB/langmetadata.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # api/language/en-GB/install.xml # api/language/en-GB/langmetadata.xml # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php
2 parents 14ca3f1 + 31c2b52 commit 447c628

File tree

87 files changed

+4542
-3707
lines changed

Some content is hidden

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

87 files changed

+4542
-3707
lines changed

‎.github/workflows/cacert-update.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Cron to update Mozilla CaCert files in the Joomla Core
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# * is a special character in YAML so you have to quote this string
7+
# Runs on the first day of every month at 03:00
8+
- cron: '0 3 1 * *'
9+
10+
jobs:
11+
build:
12+
if: (github.event_name == 'schedule' && github.repository == 'joomla/joomla-cms') || (github.event_name != 'schedule')
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
ref: 3.10-dev
20+
21+
- name: Download the latest cacert file
22+
uses: wei/wget@v1
23+
with:
24+
args: -O libraries/src/Http/Transport/cacert.pem https://curl.se/ca/cacert.pem
25+
26+
- name: Copy the cacert file to the FOF repo
27+
run: cp "libraries/src/Http/Transport/cacert.pem" "libraries/fof/download/adapter/cacert.pem"
28+
29+
- name: Create Pull Request
30+
uses: peter-evans/create-pull-request@v3
31+
id: cpr
32+
with:
33+
branch: mozilla_ca_update
34+
35+
- name: Log resulting Pull Request
36+
run: |
37+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
38+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

‎administrator/components/com_admin/script.php‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
14561456
'/administrator/components/com_joomlaupdate/helpers/select.php',
14571457
'/administrator/components/com_joomlaupdate/joomlaupdate.php',
14581458
'/administrator/components/com_joomlaupdate/models/default.php',
1459+
'/administrator/components/com_joomlaupdate/restore.php',
14591460
'/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php',
14601461
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.php',
14611462
'/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml',
@@ -4020,8 +4021,12 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
40204021
'/media/com_contenthistory/js/jquery.pretty-text-diff.js',
40214022
'/media/com_contenthistory/js/jquery.pretty-text-diff.min.js',
40224023
'/media/com_finder/js/autocompleter.js',
4024+
'/media/com_joomlaupdate/js/encryption.js',
4025+
'/media/com_joomlaupdate/js/encryption.min.js',
40234026
'/media/com_joomlaupdate/js/json2.js',
40244027
'/media/com_joomlaupdate/js/json2.min.js',
4028+
'/media/com_joomlaupdate/js/update.js',
4029+
'/media/com_joomlaupdate/js/update.min.js',
40254030
'/media/contacts/images/con_address.png',
40264031
'/media/contacts/images/con_fax.png',
40274032
'/media/contacts/images/con_info.png',
@@ -6099,13 +6104,11 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
60996104
'/templates/cassiopeia/scss/global/fonts-web_fira-sans.scss',
61006105
'/templates/cassiopeia/scss/global/fonts-web_roboto+noto-sans.scss',
61016106
// From 4.0.3 to 4.0.4
6102-
'/administrator/components/com_joomlaupdate/restore.php',
6103-
'/media/com_joomlaupdate/js/encryption.js',
6104-
'/media/com_joomlaupdate/js/encryption.min.js',
6107+
'/administrator/templates/atum/scss/_mixin.scss',
61056108
'/media/com_joomlaupdate/js/encryption.min.js.gz',
6106-
'/media/com_joomlaupdate/js/update.js',
6107-
'/media/com_joomlaupdate/js/update.min.js',
61086109
'/media/com_joomlaupdate/js/update.min.js.gz',
6110+
'/templates/cassiopeia/images/system/sort_asc.png',
6111+
'/templates/cassiopeia/images/system/sort_desc.png',
61096112
);
61106113

61116114
$folders = array(
@@ -7363,6 +7366,8 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
73637366
'/libraries/vendor/algo26-matthias/idna-convert/tests/unit',
73647367
'/libraries/vendor/algo26-matthias/idna-convert/tests/integration',
73657368
'/libraries/vendor/algo26-matthias/idna-convert/tests',
7369+
// From 4.0.3 to 4.0.4
7370+
'/templates/cassiopeia/images/system',
73667371
);
73677372

73687373
$status['files_checked'] = $files;

‎administrator/components/com_categories/src/Controller/CategoryController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected function allowEdit($data = array(), $key = 'parent_id')
125125
*
126126
* @return boolean True if successful, false otherwise.
127127
*
128-
* @since 4.0.0
128+
* @since 4.0.4
129129
*/
130130
public function save($key = null, $urlVar = null)
131131
{
@@ -145,7 +145,7 @@ public function save($key = null, $urlVar = null)
145145
*
146146
* @return boolean True if access level checks pass, false otherwise.
147147
*
148-
* @since 4.0.0
148+
* @since 4.0.4
149149
*/
150150
public function cancel($key = null)
151151
{

‎administrator/components/com_content/tmpl/featured/default.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@
194194
$transition_ids = ArrayHelper::toInteger($transition_ids);
195195

196196
?>
197-
<tr class="row<?php echo $i % 2; ?>" data-draggable-group="<?php echo $item->catid; ?>"
198-
data-transitions="<?php echo implode(',', $transition_ids); ?>"
199-
>
197+
<tr class="row<?php echo $i % 2; ?>" data-transitions="<?php echo implode(',', $transition_ids); ?>">
200198
<td class="text-center">
201199
<?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
202200
</td>

‎administrator/components/com_contenthistory/tmpl/history/modal.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
$hash = $this->state->get('sha1_hash');
2222
$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&' . Session::getFormToken() . '=1';
2323

24-
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE', true);
25-
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO', true);
24+
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION', true);
25+
Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_TWO_VERSIONS', true);
2626
Text::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
2727

2828
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */

‎administrator/components/com_fields/forms/field.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,14 @@
268268
validate="CssIdentifier"
269269
/>
270270

271+
<field
272+
name="value_render_class"
273+
type="textarea"
274+
label="COM_FIELDS_FIELD_VALUE_RENDER_CLASS_LABEL"
275+
description="COM_FIELDS_FIELD_VALUE_RENDER_CLASS_DESC"
276+
size="40"
277+
/>
278+
271279
<field
272280
name="showlabel"
273281
type="radio"

‎administrator/components/com_finder/src/Indexer/Indexer.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,12 @@ protected function addTokensToDb($tokens, $context = '')
934934

935935
foreach ($tokens as $token)
936936
{
937+
// Database size for a term field
938+
if ($token->length > 75)
939+
{
940+
continue;
941+
}
942+
937943
if ($filterCommon && $token->common)
938944
{
939945
continue;
@@ -956,7 +962,11 @@ protected function addTokensToDb($tokens, $context = '')
956962
++$values;
957963
}
958964

959-
$db->setQuery($query)->execute();
965+
// Only execute the query if there are tokens to insert
966+
if ($query->values !== null)
967+
{
968+
$db->setQuery($query)->execute();
969+
}
960970

961971
// Check if we're approaching the memory limit of the token table.
962972
if ($values > static::$state->options->get('memory_table_limit', 10000))

‎administrator/components/com_installer/src/Model/DiscoverModel.php‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,14 @@ public function discover()
169169

170170
foreach ($installedtmp as $install)
171171
{
172-
$key = implode(':', array($install->type, $install->element, $install->folder, $install->client_id));
172+
$key = implode(':',
173+
[
174+
$install->type,
175+
str_replace('\\', '/', $install->element),
176+
$install->folder,
177+
$install->client_id
178+
]
179+
);
173180
$extensions[$key] = $install;
174181
}
175182

@@ -178,7 +185,14 @@ public function discover()
178185
foreach ($results as $result)
179186
{
180187
// Check if we have a match on the element
181-
$key = implode(':', array($result->type, $result->element, $result->folder, $result->client_id));
188+
$key = implode(':',
189+
[
190+
$result->type,
191+
str_replace('\\', '/', $result->element),
192+
$result->folder,
193+
$result->client_id
194+
]
195+
);
182196

183197
if (!array_key_exists($key, $extensions))
184198
{

‎administrator/components/com_installer/tmpl/database/default.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<table class="table">
3636
<caption class="visually-hidden">
3737
<?php echo Text::_('COM_INSTALLER_DATABASE_TABLE_CAPTION'); ?>,
38-
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
39-
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
38+
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
39+
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
4040
</caption>
4141
<thead>
4242
<tr>
@@ -46,13 +46,13 @@
4646
<th scope="col">
4747
<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirection, $listOrder); ?>
4848
</th>
49-
<th scope="col" class="w-10">
49+
<th scope="col" class="w-10 d-none d-md-table-cell">
5050
<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_translated', $listDirection, $listOrder); ?>
5151
</th>
52-
<th scope="col" class="w-10">
52+
<th scope="col" class="w-10 d-none d-md-table-cell">
5353
<?php echo HTMLHelper::_('searchtools.sort', 'COM_INSTALLER_HEADING_TYPE', 'type_translated', $listDirection, $listOrder); ?>
5454
</th>
55-
<th scope="col" class="w-10 d-none d-md-table-cell">
55+
<th scope="col" class="w-10">
5656
<?php echo Text::_('COM_INSTALLER_HEADING_PROBLEMS'); ?>
5757
</th>
5858
<th scope="col" class="w-10 d-none d-md-table-cell text-end">
@@ -84,13 +84,13 @@
8484
<?php echo Text::_($manifest->description); ?>
8585
</div>
8686
</th>
87-
<td>
87+
<td class="d-none d-md-table-cell">
8888
<?php echo $extension->client_translated; ?>
8989
</td>
90-
<td>
90+
<td class="d-none d-md-table-cell">
9191
<?php echo $extension->type_translated; ?>
9292
</td>
93-
<td class="d-none d-md-table-cell">
93+
<td>
9494
<span class="badge bg-<?php echo count($item['results']['error']) ? 'danger' : ($item['errorsCount'] ? 'warning text-dark' : 'success'); ?>" tabindex="0">
9595
<?php echo Text::plural('COM_INSTALLER_MSG_DATABASE_ERRORS', $item['errorsCount']); ?>
9696
</span>

‎administrator/components/com_media/resources/scripts/components/browser/items/audio.vue‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,14 @@ export default {
175175
showActions: false,
176176
};
177177
},
178+
watch: {
179+
// eslint-disable-next-line
180+
'$store.state.showRenameModal'(show) {
181+
if (!show && this.$refs.actionToggle && this.$store.state.selectedItems.find((item) => item.name === this.item.name) !== undefined) {
182+
this.$refs.actionToggle.focus();
183+
}
184+
},
185+
},
178186
methods: {
179187
/* Preview an item */
180188
openPreview() {
@@ -193,6 +201,7 @@ export default {
193201
},
194202
/* Rename an item */
195203
openRenameModal() {
204+
this.hideActions();
196205
this.$store.commit(types.SELECT_BROWSER_ITEM, this.item);
197206
this.$store.commit(types.SHOW_RENAME_MODAL);
198207
},
@@ -214,7 +223,6 @@ export default {
214223
/* Hide actions dropdown */
215224
hideActions() {
216225
this.showActions = false;
217-
this.$nextTick(() => this.$refs.actionToggle.focus());
218226
},
219227
},
220228
};

0 commit comments

Comments
 (0)