Skip to content
Permalink
Browse files

Merge branch 'MDL-29619-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Oct 24, 2011
2 parents 8eb6f9f + 49b266c commit fdb8574046588d3d606babd86e00c82ab8272e0b
Showing with 7 additions and 0 deletions.
  1. +1 −0 mod/url/lang/en/url.php
  2. +6 −0 mod/url/view.php
@@ -44,6 +44,7 @@
$string['displayselectexplain'] = 'Choose display type, unfortunately not all types are suitable for all URLs.';
$string['externalurl'] = 'External URL';
$string['framesize'] = 'Frame height';
$string['invalidstoredurl'] = 'Invalid URL';
$string['chooseavariable'] = 'Choose a variable...';
$string['invalidurl'] = 'Entered URL is invalid';
$string['modulename'] = 'URL';
@@ -55,6 +55,12 @@
$PAGE->set_url('/mod/url/view.php', array('id' => $cm->id));
// Make sure URL is valid before generating output
$url->externalurl = clean_param($url->externalurl, PARAM_URL);
if (empty($url->externalurl)) {
print_error('invalidstoredurl', 'url');
}
if ($redirect) {
// coming from course page or url index page,
// the redirection is needed for completion tracking and logging

0 comments on commit fdb8574

Please sign in to comment.
You can’t perform that action at this time.