Skip to content

Commit fa246e2

Browse files
Bodge-ITBodge-IT
authored
Merge branch '6.0-dev' into image/thumbs
2 parents 1b7445f + a57a364 commit fa246e2

File tree

109 files changed

+566
-538
lines changed

Some content is hidden

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

109 files changed

+566
-538
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -891,10 +891,6 @@ public function cleanUp()
891891

892892
$app = Factory::getApplication();
893893

894-
// Trigger event after joomla update.
895-
// @TODO: The event dispatched twice, here and at the end of current method. One of it should be removed.
896-
$app->getDispatcher()->dispatch('onJoomlaAfterUpdate', new AfterJoomlaUpdateEvent('onJoomlaAfterUpdate'));
897-
898894
// Remove the update package.
899895
$tempdir = $app->get('tmp_path');
900896

‎administrator/components/com_newsfeeds/tmpl/newsfeed/modalreturn.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* @package Joomla.Administrator
5-
* @subpackage com_content
5+
* @subpackage com_newsfeeds
66
*
77
* @copyright (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
88
* @license GNU General Public License version 2 or later; see LICENSE.txt

‎administrator/components/com_scheduler/src/Table/TaskTable.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected function _getAssetName(): string
172172
*
173173
* @return string
174174
*
175-
* @since 5.3.0
175+
* @since 5.2.3
176176
*/
177177
protected function _getAssetTitle(): string
178178
{
@@ -191,7 +191,7 @@ protected function _getAssetTitle(): string
191191
*
192192
* @return integer
193193
*
194-
* @since 5.3.0
194+
* @since 5.2.3
195195
*/
196196
protected function _getAssetParentId(?Table $table = null, $id = null): int
197197
{

‎administrator/language/en-GB/plg_system_httpheaders.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY="<a href='https://developer.mozilla
1111
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_CLIENT="Client"
1212
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED="frame-ancestors 'self'" ; Do not translate
1313
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED_DESC="Enable the CSP clickjacking protection frame-ancestors and only allow the origin 'self'. Please use the form below to allow origins other than 'self'."
14-
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Nonce</a>" ; Please only change the URL
14+
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/nonce' target='_blank' rel='noopener noreferrer'>Nonce</a>" ; Please only change the URL
1515
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED_DESC="Enable the whitelist for specific inline scripts using a cryptographic nonce (number used once) for all scripts and styles using the Joomla API. Specifying a nonce makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without nonce support."
1616
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY_DESC="Use the header 'Content-Security-Policy-Report-Only' instead of 'Content-Security-Policy'." ; Do not translate 'Content-Security-Policy' & 'Content-Security-Policy-Report-Only'
1717
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY="Report-Only" ; Do not translate
1818
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED="strict-dynamic" ; Do not translate
1919
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED_DESC="The strict-dynamic source expression specifies that the trust explicitly given to a script present in the markup, by accompanying it with a nonce or a hash, shall be propagated to all the scripts loaded by that root script. At the same time, any allowed or source expressions such as 'self' or 'unsafe-inline' will be ignored." ; Do not translate 'strict-dynamic', 'self' and 'unsafe-inline'
2020
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Script hashes</a>" ; Please only change the URL
2121
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline scripts using a cryptographic hash for all scripts using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support."
22-
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Style hashes</a>" ; Please only change the URL
22+
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src' target='_blank' rel='noopener noreferrer'>Style hashes</a>" ; Please only change the URL
2323
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline styles using a cryptographic hash for all styles using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support."
2424
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES="Add Directive"
2525
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_DIRECTIVE="Policy Directive"
2626
PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_VALUE="Value"
2727
PLG_SYSTEM_HTTPHEADERS_COOP="Cross-Origin-Opener-Policy" ; Do not translate
2828
PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT="Client"
2929
PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT_BOTH="Both"
30-
PLG_SYSTEM_HTTPHEADERS_HSTS="<a href='https://hstspreload.org' target='_blank' rel='noopener noreferrer'>HTTP Strict Transport Security (HSTS)</a>" ; Do not translate
30+
PLG_SYSTEM_HTTPHEADERS_HSTS="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security' target='_blank' rel='noopener noreferrer'>HTTP Strict Transport Security (HSTS)</a>" ; Please only change the URL
3131
PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE="max-age" ; Do not translate
3232
PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE_DESC="This option sets the time for 'max-age', it is specified in seconds. The default value is 31536000, which corresponds to one year" ; Please do not translate 'max-age'
33-
PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="Preload" ; Do not translate
33+
PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="<a href='https://hstspreload.org' target='_blank' rel='noopener noreferrer'>Preload</a>" ; Do not translate
3434
PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_DESC="This option activates the opt-in for inclusion in so-called browser preload lists."
3535
PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE="Important"
3636
PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can no longer be called without HTTPS. Once added to the preload list, this is not easy to undo. Domains can be removed, but it takes months for users to make a change with a browser update.<br><strong>This option is very important to prevent 'man-in-the-middle attacks', so it should be activated in any case, but only if you are sure that HTTPS is supported for domain and all subdomains in the long run! The value for 'max-age' must be set to 63072000 (2 years) for recording.</strong>" ; Please do not translate 'max-age'

‎administrator/modules/mod_quickicon/tmpl/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$html = HTMLHelper::_('icons.buttons', $buttons);
2323
?>
2424
<?php if (!empty($html)) : ?>
25-
<nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . $module->title; ?>">
25+
<nav class="quick-icons px-3 pb-3" aria-label="<?php echo Text::_('MOD_QUICKICON_NAV_LABEL') . ' ' . htmlspecialchars($module->title, ENT_QUOTES, 'UTF-8'); ?>">
2626
<ul class="nav flex-wrap">
2727
<?php echo $html; ?>
2828
</ul>

‎build/build-modules-js/init/common/resolve-package.cjs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports.resolvePackageFile = (relativePath) => {
2727
* @returns {[]}
2828
*/
2929
module.exports.getPackagesUnderScope = (scope) => {
30-
const cmModules = [];
30+
const cmModules = new Set();
3131

3232
// Get the scope roots
3333
const roots = [];
@@ -41,9 +41,9 @@ module.exports.getPackagesUnderScope = (scope) => {
4141
// List of modules
4242
roots.forEach((rootPath) => {
4343
readdirSync(rootPath).forEach((subModule) => {
44-
cmModules.push(`${scope}/${subModule}`);
44+
cmModules.add(`${scope}/${subModule}`);
4545
});
4646
});
4747

48-
return cmModules;
48+
return [...cmModules];
4949
};

‎components/com_content/tmpl/archive/default_items.php‎

Lines changed: 4 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
defined('_JEXEC') or die;
1212

1313
use Joomla\CMS\HTML\HTMLHelper;
14-
use Joomla\CMS\Language\Text;
14+
use Joomla\CMS\Layout\LayoutHelper;
1515
use Joomla\CMS\Router\Route;
1616
use Joomla\Component\Content\Site\Helper\RouteHelper;
1717

@@ -36,105 +36,11 @@
3636
<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
3737
<?php echo $item->event->afterDisplayTitle; ?>
3838

39-
<?php if ($params->get('show_author') && !empty($item->author)) : ?>
40-
<div class="createdby">
41-
<?php $author = $item->created_by_alias ?: $item->author; ?>
42-
<?php $author = '<span>' . $author . '</span>'; ?>
43-
<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
44-
<?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', HTMLHelper::_('link', $this->item->contact_link, $author, ['itemprop' => 'url'])); ?>
45-
<?php else : ?>
46-
<?php echo Text::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
47-
<?php endif; ?>
48-
</div>
49-
<?php endif; ?>
5039
</div>
5140
<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
5241
|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); ?>
5342
<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
54-
<div class="com-content-archive__info article-info text-muted">
55-
<dl class="article-info">
56-
<dt class="article-info-term">
57-
<?php echo Text::_('COM_CONTENT_ARTICLE_INFO'); ?>
58-
</dt>
59-
60-
<?php if ($params->get('show_parent_category') && !empty($item->parent_id)) : ?>
61-
<dd>
62-
<div class="parent-category-name">
63-
<?php $title = $this->escape($item->parent_title); ?>
64-
<?php if ($params->get('link_parent_category') && !empty($item->parent_id)) : ?>
65-
<?php $url = '<a href="' . Route::_(
66-
RouteHelper::getCategoryRoute($item->parent_id, $item->parent_language)
67-
)
68-
. '">' . $title . '</a>'; ?>
69-
<?php echo Text::sprintf('COM_CONTENT_PARENT', $url); ?>
70-
<?php else : ?>
71-
<?php echo Text::sprintf('COM_CONTENT_PARENT', '<span>' . $title . '</span>'); ?>
72-
<?php endif; ?>
73-
</div>
74-
</dd>
75-
<?php endif; ?>
76-
<?php if ($params->get('show_category')) : ?>
77-
<dd>
78-
<div class="category-name">
79-
<?php $title = $this->escape($item->category_title); ?>
80-
<?php if ($params->get('link_category') && $item->catid) : ?>
81-
<?php $url = '<a href="' . Route::_(
82-
RouteHelper::getCategoryRoute($item->catid, $item->category_language)
83-
)
84-
. '">' . $title . '</a>'; ?>
85-
<?php echo Text::sprintf('COM_CONTENT_CATEGORY', $url); ?>
86-
<?php else : ?>
87-
<?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span>' . $title . '</span>'); ?>
88-
<?php endif; ?>
89-
</div>
90-
</dd>
91-
<?php endif; ?>
92-
93-
<?php if ($params->get('show_publish_date')) : ?>
94-
<dd>
95-
<div class="published">
96-
<span class="icon-calendar-alt" aria-hidden="true"></span>
97-
<time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>">
98-
<?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
99-
</time>
100-
</div>
101-
</dd>
102-
<?php endif; ?>
103-
104-
<?php if ($info == 0) : ?>
105-
<?php if ($params->get('show_modify_date')) : ?>
106-
<dd>
107-
<div class="modified">
108-
<span class="icon-calendar-alt" aria-hidden="true"></span>
109-
<time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>">
110-
<?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
111-
</time>
112-
</div>
113-
</dd>
114-
<?php endif; ?>
115-
<?php if ($params->get('show_create_date')) : ?>
116-
<dd>
117-
<div class="create">
118-
<span class="icon-calendar-alt" aria-hidden="true"></span>
119-
<time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>">
120-
<?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC3'))); ?>
121-
</time>
122-
</div>
123-
</dd>
124-
<?php endif; ?>
125-
126-
<?php if ($params->get('show_hits')) : ?>
127-
<dd>
128-
<div class="hits">
129-
<span class="icon-eye"></span>
130-
<meta content="UserPageVisits:<?php echo $item->hits; ?>">
131-
<?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
132-
</div>
133-
</dd>
134-
<?php endif; ?>
135-
<?php endif; ?>
136-
</dl>
137-
</div>
43+
<?php echo LayoutHelper::render('joomla.content.info_block', ['item' => $item, 'params' => $params, 'position' => 'above']); ?>
13844
<?php endif; ?>
13945

14046
<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
@@ -144,90 +50,11 @@
14450
<?php endif; ?>
14551

14652
<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
147-
<div class="article-info text-muted">
148-
<dl class="article-info">
149-
<dt class="article-info-term"><?php echo Text::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
150-
151-
<?php if ($info == 1) : ?>
152-
<?php if ($params->get('show_parent_category') && !empty($item->parent_id)) : ?>
153-
<dd>
154-
<div class="parent-category-name">
155-
<?php $title = $this->escape($item->parent_title); ?>
156-
<?php if ($params->get('link_parent_category') && $item->parent_id) : ?>
157-
<?php $url = '<a href="' . Route::_(
158-
RouteHelper::getCategoryRoute($item->parent_id, $item->parent_language)
159-
)
160-
. '">' . $title . '</a>'; ?>
161-
<?php echo Text::sprintf('COM_CONTENT_PARENT', $url); ?>
162-
<?php else : ?>
163-
<?php echo Text::sprintf('COM_CONTENT_PARENT', '<span>' . $title . '</span>'); ?>
164-
<?php endif; ?>
165-
</div>
166-
</dd>
167-
<?php endif; ?>
168-
<?php if ($params->get('show_category')) : ?>
169-
<dd>
170-
<div class="category-name">
171-
<?php $title = $this->escape($item->category_title); ?>
172-
<?php if ($params->get('link_category') && $item->catid) : ?>
173-
<?php $url = '<a href="' . Route::_(
174-
RouteHelper::getCategoryRoute($item->catid, $item->category_language)
175-
)
176-
. '">' . $title . '</a>'; ?>
177-
<?php echo Text::sprintf('COM_CONTENT_CATEGORY', $url); ?>
178-
<?php else : ?>
179-
<?php echo Text::sprintf('COM_CONTENT_CATEGORY', '<span>' . $title . '</span>'); ?>
180-
<?php endif; ?>
181-
</div>
182-
</dd>
183-
<?php endif; ?>
184-
<?php if ($params->get('show_publish_date')) : ?>
185-
<dd>
186-
<div class="published">
187-
<span class="icon-calendar-alt" aria-hidden="true"></span>
188-
<time datetime="<?php echo HTMLHelper::_('date', $item->publish_up, 'c'); ?>">
189-
<?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
190-
</time>
191-
</div>
192-
</dd>
193-
<?php endif; ?>
194-
<?php endif; ?>
195-
196-
<?php if ($params->get('show_create_date')) : ?>
197-
<dd>
198-
<div class="create">
199-
<span class="icon-calendar-alt" aria-hidden="true"></span>
200-
<time datetime="<?php echo HTMLHelper::_('date', $item->created, 'c'); ?>">
201-
<?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
202-
</time>
203-
</div>
204-
</dd>
205-
<?php endif; ?>
206-
<?php if ($params->get('show_modify_date')) : ?>
207-
<dd>
208-
<div class="modified">
209-
<span class="icon-calendar-alt" aria-hidden="true"></span>
210-
<time datetime="<?php echo HTMLHelper::_('date', $item->modified, 'c'); ?>">
211-
<?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $item->modified, Text::_('DATE_FORMAT_LC3'))); ?>
212-
</time>
213-
</div>
214-
</dd>
215-
<?php endif; ?>
216-
<?php if ($params->get('show_hits')) : ?>
217-
<dd>
218-
<div class="hits">
219-
<span class="icon-eye"></span>
220-
<meta content="UserPageVisits:<?php echo $item->hits; ?>">
221-
<?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
222-
</div>
223-
</dd>
224-
<?php endif; ?>
225-
</dl>
226-
</div>
53+
<?php echo LayoutHelper::render('joomla.content.info_block', ['item' => $item, 'params' => $params, 'position' => 'below']); ?>
22754
<?php endif; ?>
22855
<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
22956
<?php echo $item->event->afterDisplayContent; ?>
230-
</div>
57+
</div>
23158
<?php endforeach; ?>
23259
</div>
23360
<div class="com-content-archive__navigation w-100">

0 commit comments

Comments
 (0)