Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix for issue 183 - allow additional characters in JFolder #1067

Merged
merged 2 commits into from

4 participants

@aaronschmitz

Allowed characters based on http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words

Additional characters allowed in JFolder names: ()[]{}#$^+.'~`!@&=;,
Disallow : in JFolder names

@aaronschmitz

Are we depreciating the current file system?

@elinw

Christophe I don't understand the reference. Yes you have a pull request but from what i can tell first, you have not addressed this issue anywhere in your pull request (in fact JFolder and makeSafe both seem to have disappeared). If you are asking Aaron to make a similar pull request against your repo that's fine but you need to explain that not expect people to figure that out. There's no problem with people touching the same files as long as everyone is using git correctly.

In the mean time this is a highly useful and important bug fix ( : for sure should not be in the regex).

@chdemko

it's just a reference to the new file system because the old one will be deprecated

@elinw

So most of us can't read minds, it's important to explain what you mean when you paste a link.
I'm not sure what the fact that it will be deprecated has to do with the bug fix though.

@aaronschmitz

As far as I can tell #1007 isn't going to be ready for a while. Do we want to get this fixed before we tag 12.2?

@LouisLandry

Thanks Aaron!

@LouisLandry LouisLandry merged commit 3727079 into joomla:staging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  libraries/joomla/filesystem/folder.php
View
2  libraries/joomla/filesystem/folder.php
@@ -661,7 +661,7 @@ public static function listFolderTree($path, $filter, $maxLevel = 3, $level = 0,
*/
public static function makeSafe($path)
{
- $regex = array('#[^A-Za-z0-9:_\\\/-]#');
+ $regex = array('#[^A-Za-z0-9_\\\/\(\)\[\]\{\}\#\$\^\+\.\'~`!@&=;,-]#');
return preg_replace($regex, '', $path);
}
}
Something went wrong with that request. Please try again.