Merge branch 'MDL-65412-master' of http://github.com/dravek/moodle

carlooos28 · Apr 25, 2019 · 47fde84 · 47fde84
2 parents b63c0b9 + baf5551
commit 47fde84
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/customfield/field/text/classes/field_controller.php b/customfield/field/text/classes/field_controller.php
@@ -105,14 +105,16 @@ public function config_form_validation(array $data, $files = array()) : array {
             $errors['configdata[displaysize]'] = get_string('errorconfigdisplaysize', 'customfield_text');
         }
 
-        $link = $data['configdata']['link'];
-        if (strlen($link)) {
-            require_once($CFG->dirroot . '/lib/validateurlsyntax.php');
-            if (strpos($link, '$$') === false) {
-                $errors['configdata[link]'] = get_string('errorconfiglinkplaceholder', 'customfield_text');
-            } else if (!validateUrlSyntax(str_replace('$$', 'XYZ', $link), 's+H?S?F-E-u-P-a?I?p?f?q?r?')) {
-                // This validation is more strict than PARAM_URL - it requires the protocol and it must be either http or https.
-                $errors['configdata[link]'] = get_string('errorconfigdisplaysize', 'customfield_text');
+        if (isset($data['configdata']['link'])) {
+            $link = $data['configdata']['link'];
+            if (strlen($link)) {
+                require_once($CFG->dirroot . '/lib/validateurlsyntax.php');
+                if (strpos($link, '$$') === false) {
+                    $errors['configdata[link]'] = get_string('errorconfiglinkplaceholder', 'customfield_text');
+                } else if (!validateUrlSyntax(str_replace('$$', 'XYZ', $link), 's+H?S?F-E-u-P-a?I?p?f?q?r?')) {
+                    // This validation is more strict than PARAM_URL - it requires the protocol and it must be either http or https.
+                    $errors['configdata[link]'] = get_string('errorconfigdisplaysize', 'customfield_text');
+                }
             }
         }