From c21c92f11f597629d84f274a5d6c2068cc0e19cc Mon Sep 17 00:00:00 2001
From: Ankit Agarwal <ankit@moodle.com>
Date: Fri, 19 Dec 2014 15:41:22 +0530
Subject: [PATCH] MDL-48372 mod_data: Add http to urls without it during import

---
 mod/data/field/url/field.class.php | 3 ++-
 mod/data/import.php                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
index fdcfc56940c..eb0c4c57d66 100644
--- a/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@ -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;
         }
 
diff --git a/mod/data/import.php b/mod/data/import.php
index c331a8fcdde..9ab7a264960 100644
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -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];