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

moodle · Jan 6, 2015 · fba50fc · fba50fc
2 parents b7f92c3 + c21c92f
commit fba50fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
@@ -150,7 +150,8 @@ function update_content($recordid, $value, $name='') {
                 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
@@ -164,6 +164,10 @@
                     } 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];