Skip to content

Commit b35003a

Browse files
HackwarHackwar
committed
Merge branch 'refs/heads/5.1-dev' into 5.1-5.2-upmerge-20240817
# Conflicts: # 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 # build/media_source/system/js/core.es6.js # installation/language/en-GB/langmetadata.xml # language/en-GB/install.xml # language/en-GB/langmetadata.xml # libraries/src/Version.php # package-lock.json # package.json
2 parents 2468e08 + cb1b3e1 commit b35003a

File tree

43 files changed

+680
-584
lines changed

Some content is hidden

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

43 files changed

+680
-584
lines changed

‎administrator/components/com_content/src/Field/VotelistField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class VotelistField extends ListField
3737
*
3838
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
3939
* @param mixed $value The form field value to validate.
40-
* @param string $group The field name group control value. This acts as as an array container for the field.
40+
* @param string $group The field name group control value. This acts as an array container for the field.
4141
* For example if the field has name="foo" and the group value is set to "bar" then the
4242
* full field name would end up being "bar[foo]".
4343
*

‎administrator/components/com_content/src/Field/VoteradioField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class VoteradioField extends RadioField
3737
*
3838
* @param \SimpleXMLElement $element The SimpleXMLElement object representing the `<field>` tag for the form field object.
3939
* @param mixed $value The form field value to validate.
40-
* @param string $group The field name group control value. This acts as as an array container for the field.
40+
* @param string $group The field name group control value. This acts as an array container for the field.
4141
* For example if the field has name="foo" and the group value is set to "bar" then the
4242
* full field name would end up being "bar[foo]".
4343
*

‎administrator/components/com_content/src/View/Articles/HtmlView.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ protected function addToolbar()
233233
if (
234234
$user->authorise('core.create', 'com_content')
235235
&& $user->authorise('core.edit', 'com_content')
236-
&& $user->authorise('core.execute.transition', 'com_content')
237236
) {
238237
$childBar->popupButton('batch', 'JTOOLBAR_BATCH')
239238
->popupType('inline')

‎administrator/components/com_fields/src/Field/FieldLayoutField.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ protected function getInput()
5656
// Build the query.
5757
$query->select('element, name')
5858
->from('#__extensions')
59-
->where('client_id = 0')
60-
->where('type = ' . $db->quote('template'))
61-
->where('enabled = 1');
59+
->where($db->quoteName('client_id') . ' = 0')
60+
->where($db->quoteName('type') . ' = ' . $db->quote('template'))
61+
->where($db->quoteName('enabled') . ' = 1');
6262

6363
// Set the query and load the templates.
6464
$db->setQuery($query);

‎administrator/components/com_finder/tmpl/index/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Text::_('COM_FINDER_CONTENT_PLUGIN'),
4444
[
4545
'class' => 'alert-link',
46-
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
46+
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
4747
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
4848
'data-close-on-message' => '',
4949
'data-reload-on-close' => '',

‎administrator/components/com_finder/tmpl/index/emptystate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Text::_('COM_FINDER_CONTENT_PLUGIN'),
4848
[
4949
'class' => 'alert-link',
50-
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
50+
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
5151
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $this->finderPluginId),
5252
'data-close-on-message' => '',
5353
'data-reload-on-close' => '',

‎administrator/components/com_messages/tmpl/message/default.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
use Joomla\CMS\HTML\HTMLHelper;
1414
use Joomla\CMS\Language\Text;
15+
use Joomla\CMS\Mail\MailHelper;
1516
use Joomla\CMS\Router\Route;
1617

1718
/** @var \Joomla\Component\Messages\Administrator\View\Message\HtmlView $this */
@@ -41,7 +42,7 @@
4142
<dd><?php echo $this->item->subject; ?></dd>
4243

4344
<dt><?php echo Text::_('COM_MESSAGES_FIELD_MESSAGE_LABEL'); ?></dt>
44-
<dd><?php echo $this->item->message; ?></dd>
45+
<dd><?php echo MailHelper::convertRelativeToAbsoluteUrls($this->item->message); ?></dd>
4546
</dl>
4647
</div>
4748
</div>

‎administrator/components/com_redirect/tmpl/links/default.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
5252
[
5353
'class' => 'alert-link',
54-
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
54+
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
5555
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
5656
'data-close-on-message' => '',
5757
'data-reload-on-close' => '',

‎administrator/components/com_redirect/tmpl/links/emptystate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
Text::_('COM_REDIRECT_SYSTEM_PLUGIN'),
6666
[
6767
'class' => 'alert-link',
68-
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES)),
68+
'data-joomla-dialog' => $this->escape(json_encode($popupOptions, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)),
6969
'data-checkin-url' => Route::_('index.php?option=com_plugins&task=plugins.checkin&format=json&cid[]=' . $redirectPluginId),
7070
'data-close-on-message' => '',
7171
'data-reload-on-close' => '',

‎administrator/components/com_users/src/Helper/Mfa.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static function getConfigurationInterface(User $user): ?string
7777
/** @var CMSApplication $app */
7878
$app = Factory::getApplication();
7979

80-
if (!$app->getInput()->getCmd('option', '') === 'com_users') {
80+
if ($app->getInput()->getCmd('option', '') !== 'com_users') {
8181
$app->getLanguage()->load('com_users');
8282
$app->getDocument()
8383
->getWebAssetManager()

0 commit comments

Comments
 (0)