Skip to content
This repository was archived by the owner on May 10, 2025. It is now read-only.

Commit 125b2d7

Browse files
bembelimenbembelimen
committed
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev
2 parents f3c134c + 44934f7 commit 125b2d7

File tree

80 files changed

+346
-292
lines changed

Some content is hidden

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

80 files changed

+346
-292
lines changed

‎administrator/components/com_admin/script.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ protected function updateManifestCaches()
560560
* Delete files that should not exist
561561
*
562562
* @param bool $dryRun If set to true, will not actually delete files, but just report their status for use in CLI
563-
* @param bool $suppressOutput Set to true to supress echoing any errors, and just return the $status array
563+
* @param bool $suppressOutput Set to true to suppress echoing any errors, and just return the $status array
564564
*
565565
* @return array
566566
*/

‎administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--
2-
-- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
2+
-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation
33
-- except of #__finder_xxx tables, those are handled with 4.0.0-2018-07-29.sql at update.
44
--
55

‎administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql‎

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

99
--
10-
-- Step 1: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation.
10+
-- Step 1: Convert all tables to utf8mb4 character set with utf8mb4_unicode_ci collation.
1111
--
1212

1313
ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

‎administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-06-04.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- after 4.0.0 RC1
2+
UPDATE `#__template_styles`
3+
SET `title` = 'Atum - Default'
4+
WHERE `title` = 'atum - Default';
5+
6+
UPDATE `#__template_styles`
7+
SET `title` = 'Cassiopeia - Default'
8+
WHERE `title` = 'cassiopeia - Default';

‎administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-06-04.sql‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-- after 4.0.0 RC1
2+
UPDATE "#__template_styles"
3+
SET "title" = 'Atum - Default'
4+
WHERE "title" = 'atum - Default';
5+
6+
UPDATE "#__template_styles"
7+
SET "title" = 'Cassiopeia - Default'
8+
WHERE "title" = 'cassiopeia - Default';

‎administrator/components/com_admin/tmpl/help/default.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
</button>
3131
<div class="sidebar-nav" id="help-index">
3232
<ul class="nav flex-column">
33-
<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
34-
<li><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
35-
<li><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
33+
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
34+
<li class="item"><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
35+
<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
3636
<li class="divider"></li>
3737
<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
3838
<?php foreach ($this->toc as $k => $v) : ?>
39-
<li>
39+
<li class="item">
4040
<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
4141
<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
4242
</li>

‎administrator/components/com_associations/src/Field/Modal/AssociationField.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected function getInput()
9898
'bodyHeight' => 70,
9999
'modalWidth' => 80,
100100
'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'
101-
. Text::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
101+
. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>',
102102
)
103103
);
104104

‎administrator/components/com_config/tmpl/application/default_navigation.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<ul class="nav flex-column">
1515
<?php if ($this->userIsSuperAdmin) : ?>
1616
<li class="nav-header"><?php echo Text::_('COM_CONFIG_SYSTEM'); ?></li>
17-
<li class="active">
17+
<li class="item active">
1818
<a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a>
1919
</li>
2020
<li class="divider"></li>
2121
<?php endif; ?>
2222
<li class="nav-header"><?php echo Text::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
2323
<?php foreach ($this->components as $component) : ?>
24-
<li>
24+
<li class="item">
2525
<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo Text::_($component); ?></a>
2626
</li>
2727
<?php endforeach; ?>

‎administrator/components/com_config/tmpl/component/default_navigation.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ul class="nav flex-column">
1515
<?php if ($this->userIsSuperAdmin) : ?>
1616
<li class="nav-header"><?php echo Text::_('COM_CONFIG_SYSTEM'); ?></li>
17-
<li><a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a></li>
17+
<li class="item"><a href="index.php?option=com_config"><?php echo Text::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a></li>
1818
<li class="divider"></li>
1919
<?php endif; ?>
2020
<li class="nav-header"><?php echo Text::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
@@ -23,10 +23,10 @@
2323
$active = '';
2424
if ($this->currentComponent === $component)
2525
{
26-
$active = ' class="active"';
26+
$active = ' active';
2727
}
2828
?>
29-
<li<?php echo $active; ?>>
29+
<li class="item<?php echo $active; ?>">
3030
<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo Text::_($component); ?></a>
3131
</li>
3232
<?php endforeach; ?>

‎administrator/components/com_contact/config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
<fieldset
397397
name="Icons"
398398
label="COM_CONTACT_ICONS_SETTINGS"
399-
description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
399+
description="COM_CONTACT_ICONS_SETTINGS_DESC"
400400
>
401401
<field
402402
name="contact_icons"

0 commit comments

Comments
 (0)