mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48372-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-01-06 11:22:45 +00:00
commit fba50fc273
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/data/field/url/field.class.php
View File

@ -150,7 +150,8 @@ class data_field_url extends data_field_base {
break;
}
if (!empty($content->content) && (strpos($content->content, '://') === false) && (strpos($content->content, '/', 0) === false)) {
if (!empty($content->content) && (strpos($content->content, '://') === false)
&& (strpos($content->content, '/') !== 0)) {
$content->content = 'http://' . $content->content;
}

4
mod/data/import.php
View File

@ -164,6 +164,10 @@ if (!$formdata = $form->get_data()) {
} else if ($field->type == 'url') {
$values = explode(" ", $value, 2);
$content->content = $values[0];
if (!empty($content->content) && (strpos($content->content, '://') === false)
&& (strpos($content->content, '/') !== 0)) {
$content->content = 'http://' . $content->content;
}
// The url field doesn't always have two values (unforced autolinking).
if (count($values) > 1) {
$content->content1 = $values[1];