Permalink
Browse files

Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodl…

…e into MOODLE_21_STABLE
  • Loading branch information...
2 parents 7f42237 + de79cbe commit c8805386845fc6a4101390be15a8847530b28061 @nebgor nebgor committed Nov 1, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 mod/url/locallib.php
@@ -89,7 +89,7 @@ function url_get_full_url($url, $cm, $course, $config=null) {
// make sure there are no encoded entities, it is ok to do this twice
$fullurl = html_entity_decode($url->externalurl, ENT_QUOTES, 'UTF-8');
- if (preg_match('/^(\/|https?:|ftp:)/i', $fullurl) or preg_match('|^/|', $url)) {
+ 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(';/?:@=&$_.+!*(),-#%', '/');
$fullurl = preg_replace_callback("/[^$allowed]/", 'url_filter_callback', $fullurl);

0 comments on commit c880538

Please sign in to comment.