[5.2] Upmerge - Githubissues

PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/43885 Poniżej zmiany w oryginale:

Click to expand the diff!

```diff diff --git a/.drone.yml b/.drone.yml index 93e1a53c18ee9..e4e841fec44e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -162,6 +162,10 @@ steps: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 commands: - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlmax mysqli mysql + when: + event: + exclude: + - pull_request - name: phpnext-system-mysql depends_on: @@ -177,6 +181,10 @@ steps: - echo "This test is disabled because php next is not stable yet" - exit 1 - bash tests/System/drone-system-run.sh "$(pwd)" cmysqlnext mysqli mysql + when: + event: + exclude: + - pull_request - name: phpmin-system-postgres depends_on: @@ -189,6 +197,10 @@ steps: JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1 commands: - bash tests/System/drone-system-run.sh "$(pwd)" cpostgres pgsql postgres + when: + event: + exclude: + - pull_request - name: phpmax-system-postgres depends_on: @@ -216,6 +228,10 @@ steps: - echo "This test is disabled because php next is not stable yet" - exit 1 - bash tests/System/drone-system-run.sh "$(pwd)" cpostgresnext pgsql postgres + when: + event: + exclude: + - pull_request - name: artifacts-system-tests image: joomlaprojects/docker-images:packager @@ -414,6 +430,6 @@ trigger: --- kind: signature -hmac: bd41423d85abadb875c8fc911f87596ead88b62d26fabf6a283737c5a7b4c5b9 +hmac: 66d331abed02e76707b26cbf12fef3ec4506858cc748acdb5aee2c256e92ba4f ... diff --git a/administrator/components/com_actionlogs/src/Controller/DisplayController.php b/administrator/components/com_actionlogs/src/Controller/DisplayController.php index 7493052e2de1c..999dde7fe4aae 100644 --- a/administrator/components/com_actionlogs/src/Controller/DisplayController.php +++ b/administrator/components/com_actionlogs/src/Controller/DisplayController.php @@ -17,7 +17,7 @@ // phpcs:enable PSR1.Files.SideEffects /** - * Plugins display controller. + * Actionlogs display controller. * * @since 4.0.0 */ diff --git a/administrator/components/com_fields/src/Model/GroupsModel.php b/administrator/components/com_fields/src/Model/GroupsModel.php index 55c59aa154cb3..105ff8bf04d76 100644 --- a/administrator/components/com_fields/src/Model/GroupsModel.php +++ b/administrator/components/com_fields/src/Model/GroupsModel.php @@ -190,7 +190,7 @@ protected function getListQuery() if (stripos($search, 'id:') === 0) { $search = (int) substr($search, 3); $query->where($db->quoteName('a.id') . ' = :search') - ->bind(':id', $search, ParameterType::INTEGER); + ->bind(':search', $search, ParameterType::INTEGER); } else { $search = '%' . str_replace(' ', '%', trim($search)) . '%'; $query->where($db->quoteName('a.title') . ' LIKE :search') diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php index 147531c41657d..10df5a2367ece 100644 --- a/administrator/components/com_menus/src/View/Menu/XmlView.php +++ b/administrator/components/com_menus/src/View/Menu/XmlView.php @@ -115,22 +115,22 @@ protected function addXmlChild($xml, $item) { $node = $xml->addChild('menuitem'); - $node['type'] = $item->type; - if ($item->title) { $node['title'] = htmlentities($item->title, ENT_XML1); } - if ($item->link) { - $node['link'] = $item->link; - } + $node['type'] = $item->type; if ($item->element) { $node['element'] = $item->element; } - if (isset($item->class) && $item->class) { - $node['class'] = htmlentities($item->class, ENT_XML1); + if ($item->link) { + $node['link'] = $item->link; + } + + if (isset($item->class) && trim($item->class)) { + $node['class'] = htmlentities(trim($item->class), ENT_XML1); } if ($item->access) { @@ -141,6 +141,34 @@ protected function addXmlChild($xml, $item) $node['target'] = '_blank'; } + if ($item->getParams()->get('ajax-badge')) { + $node['ajax-badge'] = $item->getParams()->get('ajax-badge'); + } + + if ($item->icon) { + $node['icon'] = $item->icon; + } + + if ($item->getParams()->get('menu-quicktask')) { + $node['quicktask'] = $item->getParams()->get('menu-quicktask'); + + if ($item->getParams()->get('menu-quicktask-title')) { + $node['quicktask-title'] = $item->getParams()->get('menu-quicktask-title'); + } + + if ($item->getParams()->get('menu-quicktask-icon')) { + $node['quicktask-icon'] = $item->getParams()->get('menu-quicktask-icon'); + } + + if ($item->getParams()->get('menu-quicktask-permission')) { + $node['quicktask-permission'] = $item->getParams()->get('menu-quicktask-permission'); + } + } + + if ($item->getParams()->get('dashboard')) { + $node['dashboard'] = $item->getParams()->get('dashboard'); + } + if ($item->getParams() && $hideitems = $item->getParams()->get('hideitems')) { $item->getParams()->set('hideitems', $this->getModel('Menu')->getExtensionElementsForMenuItems($hideitems)); diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php index 324e3220335f8..d1c19166ea2cf 100644 --- a/administrator/components/com_users/src/Model/UserModel.php +++ b/administrator/components/com_users/src/Model/UserModel.php @@ -142,7 +142,7 @@ public function getForm($data = [], $loadData = true) // When multilanguage is set, a user's default site language should also be a Content Language if (Multilanguage::isEnabled()) { - $form->setFieldAttribute('language', 'type', 'frontend_language', 'params'); + $form->setFieldAttribute('language', 'type', 'frontendlanguage', 'params'); } $userId = (int) $form->getValue('id'); diff --git a/build/media_source/system/js/fields/modal-content-select-field.es6.js b/build/media_source/system/js/fields/modal-content-select-field.es6.js index 1d123a1aef913..382662599f648 100644 --- a/build/media_source/system/js/fields/modal-content-select-field.es6.js +++ b/build/media_source/system/js/fields/modal-content-select-field.es6.js @@ -113,18 +113,24 @@ const setupField = (container) => { const action = button.dataset.buttonAction; const dialogConfig = button.dataset.modalConfig ? JSON.parse(button.dataset.modalConfig) : {}; const keyName = container.dataset.keyName || 'id'; + const token = Joomla.getOptions('csrf.token', ''); // Handle requested action let handle; switch (action) { case 'select': - case 'create': + case 'create': { + const url = dialogConfig.src.indexOf('http') === 0 ? new URL(dialogConfig.src) : new URL(dialogConfig.src, window.location.origin); + url.searchParams.set(token, '1'); + dialogConfig.src = url.toString(); handle = doSelect(inputValue, inputTitle, dialogConfig); break; + } case 'edit': { // Update current value in the URL const url = dialogConfig.src.indexOf('http') === 0 ? new URL(dialogConfig.src) : new URL(dialogConfig.src, window.location.origin); url.searchParams.set(keyName, inputValue.value); + url.searchParams.set(token, '1'); dialogConfig.src = url.toString(); handle = doSelect(inputValue, inputTitle, dialogConfig); diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.es6.js index 95ff1605d8ffd..e7248a6c5f386 100644 --- a/build/media_source/system/js/showon.es6.js +++ b/build/media_source/system/js/showon.es6.js @@ -146,7 +146,7 @@ class Showon { itemval = Array.from(originField.querySelectorAll('option:checked')).map((el) => el.value); } else { // Select lists, text-area etc. Note that multiple-select list returns - // an Array here s0 we can always treat 'itemval' as an array + // an Array here so we can always treat 'itemval' as an array itemval = document.getElementById(originId).value; // Check data attribute data-global instead of value in

JoomlaPolska / jezyk-J4

[5.2] Upmerge #556