Updating 4.3-dev with changes from 4.2-dev #39548
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix contact category association * Update administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Richard Fath <[email protected]>
Identical PR to # joomla#38300 but for logout instead of login
Obvious typo in comment
I was testing a script using the joomla repo and found these typos/grammar errors. The basic english language rule is that if you want to write "a something" and the "something" begins with a vowel then it changes to "an" This also applies even if the "something" _sounds_ like it begins with a vowel. As these are all corrections in comments testing is just by review
* [4.2] Download Key Filters The text says missing but the filter says invalid. They do not mean the same. The text says download key but the filter says valid but it doesn't validate the key it just says if the field has content or not * styleguide
This fixes a bug exposed in my own pr joomla#38447 That PR added an action dropdown button When you have overrides. See the original PR for details However it also added the dropdown when the file was open for editing but at that point it can be selected because it is never active. This PR removes the button when the file is open for editing. A better PR would be to make it (or a similar button) work in the edit mode but I don't have the time (and probably the skill) to do that. So at this time I consider this PR a bug fix and the functionality can be added at a later date in another pr Testing requires overrides that need checking. You can simulate this by 1. Create template overrides for com_content/article and com_newsfeed/feed 2. Run this sql query replacing #_ with your db prefix INSERT INTO `#__template_overrides` (`id`, `template`, `hash_id`, `extension_id`, `state`, `action`, `client_id`, `created_date`, `modified_date`) VALUES (1, 'cassiopeia', 'L2h0bWwvY29tX25ld3NmZWVkcy9uZXdzZmVlZC9kZWZhdWx0LnBocA==', 223, 0, 'Joomla Update', 0, '2022-09-01 13:51:54', '2022-09-01 13:51:54'), (2, 'cassiopeia', 'L2h0bWwvY29tX2NvbnRlbnQvYXJ0aWNsZS9kZWZhdWx0X2xpbmtzLnBocA==', 223, 0, 'Joomla Update', 0, '2022-09-01 13:51:54', '2022-09-01 13:51:54'); You will now have two override files to update and can test this PR
It is possible that the template->name does not match the template->element When that is the case then it is not possible to open the larger preview image of the template as the id of the modal is not the same as the id referenced in the button. This PR corrects that by using template->element in both places. To test The easiest way will be to create a child of cassiopeia and then edit the database. in #__extensions find the record for the child template and change the name only. Now in the admin template manager you will find that you get a js error when you try to open the larger preview image. Apply this PR and you will find that the preview opens correctly
* [4.2.6] Email cloaking fails. (joomla#39336) Pull Request for Issue joomla#39422 . ### Summary of Changes a) modification of the last pattern b) added more patterns ### Testing Instructions create article with for the last pattern: <img class="img-thumbnail" style="border: 1px solid #00f;" title="[email protected]" src="/www/j4test/images/joomla_black.png" alt="" /> <input type="text" placeholder="[email protected]" /> for the new pattern (email as plain text within html-attributes): <a class="btn btn-danger" style="border: 2px solid #f00;" title="[email protected]" href="#">email</a> <a title="[email protected]" href="#">email</a> <ul> <li title="[email protected]">email 1</li> <li title="[email protected]">email 2</li> </ul> for the new last pattern (email as plain text but not within HTML tags): <span>[email protected]</span> <ul> <li>[email protected]</li> <li>[email protected]</li> </ul> ### Actual result BEFORE applying this Pull Request a) the pattern was too hungry b) emails as plain text within html-attributes and not within html-tags was not cloaked ### Expected result AFTER applying this Pull Request a) the pattern was not too hungry b) emails as plain text within html-attributes and not within html-tags was cloaked ### Link to documentations Please select: - [ ] Documentation link for docs.joomla.org: <link> - [x ] No documentation changes for docs.joomla.org needed - [ ] Pull Request link for manual.joomla.org: <link> - [x ] No documentation changes for manual.joomla.org needed * phpcs errors * Error found in line 447 and 451
* Update Table.php Query requires back-quoted table name to acommodate for table names with special characters. * quoteName in methods checkIn(), checkOut() See joomla#39489 (comment) * quoteName in all mysql table references Legal table names with special characters throw exceptions. QuoteName each query avoids fixes this Co-authored-by: ReLater <[email protected]>
…joomla#39446) * Make sure we are not using downloadSources from another version * Fix typo in comment Co-authored-by: Quy <[email protected]>
Contributor
Author
|
No matter what, we get: |
Contributor
|
@obuisard change Line 26 in 23c43ed node:16-bullseye-slim and ask @HLeithner to sign the change so that the tests could run... (it took me quite some time to figure out what was wrong. What happens when someone debugs on a blank screen)
Also please add require('dotenv').config();after |
dgrammatiko
reviewed
Jan 8, 2023
Adding require('dotenv').config();
reverted node:16-alpine
Contributor
|
@obuisard I think the .drone.yml is wrong, 4.3 should have cypress not codeception for the tests. I'll say just paste the one form 4.3 directly, eg https://raw.githubusercontent.com/joomla/joomla-cms/4.3-dev/.drone.yml |
Re-inject original file before the upmerge
dgrammatiko
reviewed
Jan 8, 2023
dgrammatiko
reviewed
Jan 8, 2023
dgrammatiko
reviewed
Jan 8, 2023
dgrammatiko
reviewed
Jan 8, 2023
dgrammatiko
reviewed
Jan 8, 2023
dgrammatiko
reviewed
Jan 8, 2023
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
dgrammatiko
reviewed
Jan 8, 2023
deleted return
dgrammatiko
reviewed
Jan 8, 2023
Co-authored-by: Dimitris Grammatikogiannis <[email protected]>
Contributor
Author
|
THANK YOU, Dimitris @dgrammatiko for helping sort this out. Thanks to Brian @brianteeman for also testing things out and all for your advice. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.