Skip to content

Commit c7dc02c

Browse files
Bodge-ITBodge-IT
authored
[6.0] Upmerges - 2024-10-30
2 parents 25ee0bd + 2f19295 commit c7dc02c

File tree

50 files changed

+601
-216
lines changed

Some content is hidden

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

50 files changed

+601
-216
lines changed

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins/content/finder/* @hackwar
66
plugins/finder/* @hackwar
77

88
# Release Tools
9-
build.xml @fancyFranci
109
build/build.php @rdeutz
1110
build/bump.php @rdeutz
1211
build/deleted_file_check.php @rdeutz
@@ -17,12 +16,12 @@ libraries/src/Installer/* @rdeutz
1716
libraries/src/Updater/* @rdeutz
1817

1918
# Automated Testing
20-
tests/* @hackwar @fancyFranci
21-
tests/Unit/* @rdeutz @fancyFranci
22-
.appveyor.yml @rdeutz @hackwar @fancyFranci
23-
.drone.yml @rdeutz @hackwar @fancyFranci
24-
phpunit.xml.dist @rdeutz @hackwar @fancyFranci
25-
phpunit-pgsql.xml.dist @rdeutz @hackwar @fancyFranci
19+
tests/* @hackwar @laoneo
20+
tests/Unit/* @rdeutz @laoneo
21+
.appveyor.yml @rdeutz @hackwar @laoneo
22+
.drone.yml @rdeutz @hackwar @laoneo
23+
phpunit.xml.dist @rdeutz @hackwar @laoneo
24+
phpunit-pgsql.xml.dist @rdeutz @hackwar @laoneo
2625

2726
# Workflow
2827
administrator/components/com_workflow/* @bembelimen @hleithner

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ The Joomla! 6.0 branch is under heavy development and not all links in this docu
55
------------------------------------------------------------------------------------------------------
66

77
Build Status
8-
---------------------
9-
| Drone-CI | AppVeyor | PHP | Node | npm |
10-
|--------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
11-
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=6.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/6.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
8+
9+
| Drone-CI | AppVeyor | PHP | Node | npm |
10+
|------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
11+
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=6.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/6.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
1212

1313
Overview
1414
---------------------

‎administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UPDATE `#__assets` SET `title` = 'PUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish';
2+
UPDATE `#__assets` SET `title` = 'UNPUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unpublish';
3+
UPDATE `#__assets` SET `title` = 'TRASH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Trash';
4+
UPDATE `#__assets` SET `title` = 'ARCHIVE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Archive';
5+
UPDATE `#__assets` SET `title` = 'FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Feature';
6+
UPDATE `#__assets` SET `title` = 'UNFEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unfeature';
7+
UPDATE `#__assets` SET `title` = 'PUBLISH_AND_FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish & Feature';

‎administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
UPDATE "#__assets" SET "title" = 'PUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish';
2+
UPDATE "#__assets" SET "title" = 'UNPUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unpublish';
3+
UPDATE "#__assets" SET "title" = 'TRASH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Trash';
4+
UPDATE "#__assets" SET "title" = 'ARCHIVE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Archive';
5+
UPDATE "#__assets" SET "title" = 'FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Feature';
6+
UPDATE "#__assets" SET "title" = 'UNFEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unfeature';
7+
UPDATE "#__assets" SET "title" = 'PUBLISH_AND_FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish & Feature';

‎administrator/components/com_cache/src/View/Cache/HtmlView.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function display($tpl = null): void
104104
throw new GenericDataException(implode("\n", $errors), 500);
105105
}
106106

107-
if (!\count($this->data) && $this->state->get('filter.search') === '') {
107+
if (!\count($this->data) && ($this->state->get('filter.search') === null || $this->state->get('filter.search') === '')) {
108108
$this->setLayout('emptystate');
109109
}
110110

‎administrator/components/com_content/src/Model/FeaturedModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
namespace Joomla\Component\Content\Administrator\Model;
1212

13-
// phpcs:disable PSR1.Files.SideEffects
1413
use Joomla\Database\QueryInterface;
1514

15+
// phpcs:disable PSR1.Files.SideEffects
1616
\defined('_JEXEC') or die;
1717
// phpcs:enable PSR1.Files.SideEffects
1818

‎administrator/components/com_menus/tmpl/items/default_batch_body.php‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
defined('_JEXEC') or die;
1212

13-
use Joomla\CMS\Factory;
1413
use Joomla\CMS\HTML\HTMLHelper;
1514
use Joomla\CMS\Language\Multilanguage;
1615
use Joomla\CMS\Language\Text;
@@ -24,7 +23,6 @@
2423
];
2524
$published = (int) $this->state->get('filter.published');
2625
$clientId = (int) $this->state->get('filter.client_id');
27-
$menuType = Factory::getApplication()->getUserState('com_menus.items.menutype', '');
2826

2927
if ($clientId == 1) {
3028
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
@@ -34,23 +32,22 @@
3432
}
3533
?>
3634
<div class="p-3">
37-
<?php if (strlen($menuType) && $menuType != '*') : ?>
38-
<?php if ($clientId != 1) : ?>
39-
<div class="row">
35+
<?php if ($clientId != 1) : ?>
36+
<div class="row">
4037
<?php if (Multilanguage::isEnabled()) : ?>
38+
<div class="form-group col-md-6">
39+
<div class="controls">
40+
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
41+
</div>
42+
</div>
43+
<?php endif; ?>
4144
<div class="form-group col-md-6">
4245
<div class="controls">
43-
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
46+
<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
4447
</div>
4548
</div>
46-
<?php endif; ?>
47-
<div class="form-group col-md-6">
48-
<div class="controls">
49-
<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
50-
</div>
5149
</div>
52-
</div>
53-
<?php endif; ?>
50+
<?php endif; ?>
5451
<div class="row">
5552
<?php if ($published >= 0) : ?>
5653
<div class="form-group col-md-6">
@@ -82,17 +79,12 @@
8279
<p><?php echo Text::_('COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED'); ?></p>
8380
<?php endif; ?>
8481
</div>
85-
<?php else : ?>
86-
<div class="row">
87-
<p><?php echo Text::_('COM_MENUS_SELECT_MENU_FIRST'); ?></p>
88-
</div>
89-
<?php endif; ?>
90-
</div>
91-
<?php if ((strlen($menuType) && $menuType != '*' && $clientId == 0) || ($published >= 0 && $clientId == 1)) : ?>
92-
<div class="btn-toolbar p-3">
93-
<joomla-toolbar-button task="item.batch" class="ms-auto">
94-
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
95-
</joomla-toolbar-button>
9682
</div>
83+
<?php if ($clientId == 0 || ($published >= 0 && $clientId == 1)) : ?>
84+
<div class="btn-toolbar p-3">
85+
<joomla-toolbar-button task="item.batch" class="ms-auto">
86+
<button type="button" class="btn btn-success"><?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?></button>
87+
</joomla-toolbar-button>
88+
</div>
9789
<?php endif; ?>
9890

‎administrator/components/com_privacy/tmpl/consents/default.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
0 => Text::_('COM_PRIVACY_CONSENTS_STATE_OBSOLETE'),
3535
1 => Text::_('COM_PRIVACY_CONSENTS_STATE_VALID')
3636
];
37+
$this->getLanguage()->load('plg_system_privacyconsent', JPATH_ADMINISTRATOR);
3738

3839
?>
3940
<form action="<?php echo Route::_('index.php?option=com_privacy&view=consents'); ?>" method="post" name="adminForm" id="adminForm">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
176176
COM_MENUS_SELECT_MENU="- Select Menu -"
177177
COM_MENUS_SELECT_MENU_FILTER="Select Menu"
178178
COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
179+
; Deprecated, will be removed with 6.0
179180
COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
180181
COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."
181182
COM_MENUS_SUBMENU_ITEMS="Menu Items"

‎administrator/language/en-GB/mod_guidedtours.sys.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
; Note : All ini files need to be saved as UTF-8
55

66
MOD_GUIDEDTOURS="Guided Tours"
7+
MOD_GUIDEDTOURS_LAYOUT_DEFAULT="Default"
78
MOD_GUIDEDTOURS_XML_DESCRIPTION="This module shows a list of the available guided tours."

0 commit comments

Comments
 (0)