Skip to content

Conversation

@brianteeman
Copy link
Contributor

This fixes a language string error in my own pr #38451

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

image

This fixes a language string error in my own pr joomla#38451

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
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.2-dev labels Dec 1, 2022
@chmst
Copy link
Contributor

chmst commented Dec 1, 2022

I have tested this item ✅ successfully on 140924a

code review


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/39336.

@alikon
Copy link
Contributor

alikon commented Dec 3, 2022

I have tested this item ✅ successfully on 140924a


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/39336.

@richard67
Copy link
Member

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/39336.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Dec 4, 2022
@fancyFranci fancyFranci merged commit b732616 into joomla:4.2-dev Dec 27, 2022
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Dec 27, 2022
@fancyFranci fancyFranci added this to the Joomla! 4.2.7 milestone Dec 27, 2022
@fancyFranci
Copy link
Contributor

Thank you!

@brianteeman brianteeman deleted the 38451-fix branch December 27, 2022 13:29
LukasHH added a commit to LukasHH/joomla-cms that referenced this pull request Dec 27, 2022
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
roland-d pushed a commit that referenced this pull request Dec 29, 2022
* [4.2.6] Email cloaking fails. (#39336)
Pull Request for Issue #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
Kostelano added a commit to JPathRu/localisation that referenced this pull request Feb 1, 2023
* Joomla 4.2.6
joomla/joomla-cms#39143 - (только для en-GB)
joomla/joomla-cms#39317 - (исправлено ранее)

* Joomla 4.2.7
joomla/joomla-cms#39376 +
joomla/joomla-cms#39336 - (только для en-GB)
joomla/joomla-cms#39629 - (только для en-GB)
joomla/joomla-cms#37574 +
joomla/joomla-cms#38781 - (только для en-GB)
joomla/joomla-cms#39677 - (исправлено ранее)
joomla/joomla-cms#39682 - (только для en-GB)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Language Change This is for Translators

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants