Skip to content

Blacklist and Whitelist#11330

Merged
rdeutz merged 3 commits intojoomla:stagingfrom
brianteeman:blacklist
Aug 13, 2016
Merged

Blacklist and Whitelist#11330
rdeutz merged 3 commits intojoomla:stagingfrom
brianteeman:blacklist

Conversation

@brianteeman
Copy link
Copy Markdown
Contributor

@brianteeman brianteeman commented Jul 28, 2016

It is more normal for these to be one word and not two words. I have updated the words2watch list for this https://joomla.github.io/user-interface-text/?user-interface-text/words2watch.md and this simple PR corrects the core strings and comments

@MATsxm
Copy link
Copy Markdown

MATsxm commented Jul 28, 2016

I have tested this item ✅ successfully on 38b62d5

+1 - Thanks

On code review


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

@andrepereiradasilva
Copy link
Copy Markdown
Contributor

I have tested this item ✅ successfully on 38b62d5

on code review


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

@brianteeman
Copy link
Copy Markdown
Contributor Author

RTC


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Jul 28, 2016
@brianteeman brianteeman added this to the Joomla 3.6.2 milestone Jul 28, 2016

/**
* The array of permitted tags (white list).
* The array of permitted tags (whitelist).
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we revert this and make the change in the framework package please :)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

@wilsonge wilsonge Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cant update it there as the bug is not present there and the file is very different anyay

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure I saw that and felt the way that was written was wrong and
fixed it there at some point. Either way as long as it's consistently
correct we're good.

On Thursday, July 28, 2016, Brian Teeman notifications@github.com wrote:

In libraries/vendor/joomla/filter/src/InputFilter.php
#11330 (comment):

@@ -30,15 +30,15 @@ class InputFilter
protected static $instances = array();

/**
  • * The array of permitted tags (white list).
  • * The array of permitted tags (whitelist).

Cant update it there as the bug is not present there and the file is very
different anyay


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
https://github.com/joomla/joomla-cms/pull/11330/files/38b62d5391c73a629a04f4f1a0aa52c2c347617d#r72715446,
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAWfoewQOf4b8mcznk1LD8O2SN3BZ91gks5qaS5BgaJpZM4JXMSe
.

@brianteeman
Copy link
Copy Markdown
Contributor Author

Removed the commit to the vendor file

@wilsonge
Copy link
Copy Markdown
Contributor

Thanks :)

@rdeutz rdeutz merged commit 57b6e8c into joomla:staging Aug 13, 2016
@brianteeman brianteeman deleted the blacklist branch August 13, 2016 17:15
@brianteeman brianteeman removed the RTC This Pull Request is Ready To Commit label Aug 13, 2016
ggppdk pushed a commit to ggppdk/joomla-cms that referenced this pull request Aug 19, 2016
* blacklist

* whitelist

* remove vendor
roland-d pushed a commit to roland-d/joomla-cms that referenced this pull request Sep 11, 2016
* blacklist

* whitelist

* remove vendor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants