Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…e into MOODLE_20_STABLE
  • Loading branch information...
commit a4276fe09638e602d145976bc8f268b9fbb552ee 2 parents d14031e + 494268c
@nebgor nebgor authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  mod/url/locallib.php
  2. +1 −1  mod/url/version.php
View
2  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);
View
2  mod/url/version.php
@@ -26,7 +26,7 @@
defined('MOODLE_INTERNAL') || die;
-$module->version = 2010101400;
+$module->version = 2010101401;
$module->requires = 2010080300; // Requires this Moodle version
$module->cron = 0;
Please sign in to comment.
Something went wrong with that request. Please try again.