Browse files

Merge branch 'w50_MDL-30595_m20_regex' of git://github.com/skodak/moo…

…dle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 2316dcf + 88ec670 commit 88ade60cf4d92d08e26036158bdfaae39aab8c3d @stronk7 stronk7 committed Dec 7, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 mod/url/locallib.php
View
2 mod/url/locallib.php
@@ -91,7 +91,7 @@ function url_get_full_url($url, $cm, $course, $config=null) {
if (preg_match('/^(\/|https?:|ftp:)/i', $fullurl) or preg_match('|^/|', $fullurl)) {
// encode extra chars in URLs - this does not make it always valid, but it helps with some UTF-8 problems
- $allowed = "a-zA-Z0-9".preg_quote(';/?:@=&$_.+!*(),-#%', '/');
+ $allowed = "a-zA-Z0-9".preg_quote(';/?:@=&$_.+!*(),#%-', '/');
$fullurl = preg_replace_callback("/[^$allowed]/", 'url_filter_callback', $fullurl);
} else {
// encode special chars only

0 comments on commit 88ade60

Please sign in to comment.